diff --git a/benchmark/foldable/CMakeLists.txt b/benchmark/foldable/CMakeLists.txt
index c333d94e8..b8012efa5 100644
--- a/benchmark/foldable/CMakeLists.txt
+++ b/benchmark/foldable/CMakeLists.txt
@@ -14,7 +14,7 @@ foreach(method IN ITEMS count foldl foldl1 foldr foldr1 for_each length maximum
                 {
                     setup: '
                         #include <boost/hana/integral.hpp>
-                        #include <boost/hana/tuple/foldable.hpp>
+                        #include <boost/hana/tuple.hpp>
                     ',
                     foldable: \"boost::hana::tuple(#{xs})\",
                     input_size: n
@@ -30,7 +30,7 @@ foreach(method IN ITEMS count foldl foldl1 foldr foldr1 for_each length maximum
 
                 {
                     setup: '
-                        #include <boost/hana/ext/std/tuple/foldable.hpp>
+                        #include <boost/hana/ext/std/tuple.hpp>
                         #include <boost/hana/integral.hpp>
                         #include <tuple>
                     ',
@@ -44,7 +44,7 @@ foreach(method IN ITEMS count foldl foldl1 foldr foldr1 for_each length maximum
             ((1..50).to_a + (51..500).step(25).to_a).map { |n|
                 xs = (1..n).to_a.map { |i| \"x<#{i}>{}\" }.join(', ')
                 {
-                    setup: '#include <boost/hana/tuple/foldable.hpp>',
+                    setup: '#include <boost/hana/tuple.hpp>',
                     foldable: \"boost::hana::tuple(#{xs})\",
                     input_size: n
                 }
@@ -56,7 +56,7 @@ foreach(method IN ITEMS count foldl foldl1 foldr foldr1 for_each length maximum
                 xs = (1..n).to_a.map { |i| \"x<#{i}>{}\" }.join(', ')
                 {
                     setup: '
-                        #include <boost/hana/ext/std/tuple/foldable.hpp>
+                        #include <boost/hana/ext/std/tuple.hpp>
                         #include <tuple>
                     ',
                     foldable: \"std::make_tuple(#{xs})\",
@@ -71,7 +71,7 @@ foreach(method IN ITEMS count foldl foldl1 foldr foldr1 for_each length maximum
         FEATURES COMPILATION_TIME EXECUTION_TIME MEMORY_USAGE
         ENV "((1..50).to_a + (51..500).step(25).to_a).map { |n|
             {
-                setup: '#include <boost/hana/range/foldable.hpp>',
+                setup: '#include <boost/hana/range.hpp>',
                 foldable: \"boost::hana::range_c<int, 0, #{n}>\",
                 input_size: n
             }
diff --git a/benchmark/foldable/count.cpp b/benchmark/foldable/count.cpp
index f694df333..c92f22ba5 100644
--- a/benchmark/foldable/count.cpp
+++ b/benchmark/foldable/count.cpp
@@ -4,8 +4,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/bool/logical.hpp>
-#include <boost/hana/foldable/foldable.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/fwd/foldable.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/foldable/foldl.cpp b/benchmark/foldable/foldl.cpp
index 669f2a069..016c711c1 100644
--- a/benchmark/foldable/foldl.cpp
+++ b/benchmark/foldable/foldl.cpp
@@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0.
  */
 
 #include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/foldable/foldable.hpp>
+#include <boost/hana/fwd/foldable.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/foldable/foldl1.cpp b/benchmark/foldable/foldl1.cpp
index 9e2ba1e0d..98ba69e93 100644
--- a/benchmark/foldable/foldl1.cpp
+++ b/benchmark/foldable/foldl1.cpp
@@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0.
  */
 
 #include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/foldable/foldable.hpp>
+#include <boost/hana/fwd/foldable.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/foldable/foldr.cpp b/benchmark/foldable/foldr.cpp
index e5227eb53..404d33748 100644
--- a/benchmark/foldable/foldr.cpp
+++ b/benchmark/foldable/foldr.cpp
@@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0.
  */
 
 #include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/foldable/foldable.hpp>
+#include <boost/hana/fwd/foldable.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/foldable/foldr1.cpp b/benchmark/foldable/foldr1.cpp
index f6f8a1e5a..5d5565697 100644
--- a/benchmark/foldable/foldr1.cpp
+++ b/benchmark/foldable/foldr1.cpp
@@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0.
  */
 
 #include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/foldable/foldable.hpp>
+#include <boost/hana/fwd/foldable.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/foldable/for_each.cpp b/benchmark/foldable/for_each.cpp
index 25faee980..d79810ff7 100644
--- a/benchmark/foldable/for_each.cpp
+++ b/benchmark/foldable/for_each.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/foldable/foldable.hpp>
+#include <boost/hana/fwd/foldable.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/foldable/length.cpp b/benchmark/foldable/length.cpp
index 449f12102..49e648765 100644
--- a/benchmark/foldable/length.cpp
+++ b/benchmark/foldable/length.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/foldable/foldable.hpp>
+#include <boost/hana/fwd/foldable.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/foldable/maximum.cpp b/benchmark/foldable/maximum.cpp
index deb6bfe08..48a9c4941 100644
--- a/benchmark/foldable/maximum.cpp
+++ b/benchmark/foldable/maximum.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/foldable/foldable.hpp>
+#include <boost/hana/fwd/foldable.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/foldable/maximum_by.cpp b/benchmark/foldable/maximum_by.cpp
index 7007a6ba5..af1a19e49 100644
--- a/benchmark/foldable/maximum_by.cpp
+++ b/benchmark/foldable/maximum_by.cpp
@@ -4,8 +4,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/bool/logical.hpp>
-#include <boost/hana/foldable/foldable.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/fwd/foldable.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/foldable/minimum.cpp b/benchmark/foldable/minimum.cpp
index 797d03300..f7dc630af 100644
--- a/benchmark/foldable/minimum.cpp
+++ b/benchmark/foldable/minimum.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/foldable/foldable.hpp>
+#include <boost/hana/fwd/foldable.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/foldable/minimum_by.cpp b/benchmark/foldable/minimum_by.cpp
index f09b74b95..39e5ac0db 100644
--- a/benchmark/foldable/minimum_by.cpp
+++ b/benchmark/foldable/minimum_by.cpp
@@ -4,8 +4,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/bool/logical.hpp>
-#include <boost/hana/foldable/foldable.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/fwd/foldable.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/foldable/product.cpp b/benchmark/foldable/product.cpp
index 1e663f739..31b9081ba 100644
--- a/benchmark/foldable/product.cpp
+++ b/benchmark/foldable/product.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/foldable/foldable.hpp>
+#include <boost/hana/fwd/foldable.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/foldable/sum.cpp b/benchmark/foldable/sum.cpp
index 37cb14c4c..1b4d70837 100644
--- a/benchmark/foldable/sum.cpp
+++ b/benchmark/foldable/sum.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/foldable/foldable.hpp>
+#include <boost/hana/fwd/foldable.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/foldable/unpack.cpp b/benchmark/foldable/unpack.cpp
index d9c345dc7..f021946e3 100644
--- a/benchmark/foldable/unpack.cpp
+++ b/benchmark/foldable/unpack.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/foldable/foldable.hpp>
+#include <boost/hana/fwd/foldable.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/functor/CMakeLists.txt b/benchmark/functor/CMakeLists.txt
index 796be6c61..6152c4eee 100644
--- a/benchmark/functor/CMakeLists.txt
+++ b/benchmark/functor/CMakeLists.txt
@@ -12,7 +12,7 @@ foreach(method IN ITEMS adjust fill fmap replace)
                 \"boost::hana::benchmark::object<#{i}>{}\"
             }.join(', ')
             {
-                setup: '#include <boost/hana/tuple/functor.hpp>',
+                setup: '#include <boost/hana/tuple.hpp>',
                 functor: \"boost::hana::tuple(#{xs})\",
                 input_size: n
             }
@@ -28,7 +28,7 @@ foreach(method IN ITEMS adjust fill fmap replace)
             }.join(', ')
             {
                 setup: '
-                    #include <boost/hana/ext/std/tuple/functor.hpp>
+                    #include <boost/hana/ext/std/tuple.hpp>
                     #include <tuple>
                 ',
                 functor: \"std::make_tuple(#{xs})\",
diff --git a/benchmark/functor/adjust.cpp b/benchmark/functor/adjust.cpp
index 58cac8c4e..4900d7365 100644
--- a/benchmark/functor/adjust.cpp
+++ b/benchmark/functor/adjust.cpp
@@ -4,9 +4,9 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/bool/logical.hpp>
+#include <boost/hana/bool.hpp>
 #include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/functor/functor.hpp>
+#include <boost/hana/fwd/functor.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/functor/fill.cpp b/benchmark/functor/fill.cpp
index b26af55cb..1cee471c6 100644
--- a/benchmark/functor/fill.cpp
+++ b/benchmark/functor/fill.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/functor/functor.hpp>
+#include <boost/hana/fwd/functor.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/functor/fmap.cpp b/benchmark/functor/fmap.cpp
index 0f39a0e3f..4b4105b62 100644
--- a/benchmark/functor/fmap.cpp
+++ b/benchmark/functor/fmap.cpp
@@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0.
  */
 
 #include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/functor/functor.hpp>
+#include <boost/hana/fwd/functor.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/functor/replace.cpp b/benchmark/functor/replace.cpp
index 561fedf9d..df3f7a2f5 100644
--- a/benchmark/functor/replace.cpp
+++ b/benchmark/functor/replace.cpp
@@ -4,8 +4,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/bool/logical.hpp>
-#include <boost/hana/functor/functor.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/fwd/functor.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/iterable/CMakeLists.txt b/benchmark/iterable/CMakeLists.txt
index c48709459..523d4768d 100644
--- a/benchmark/iterable/CMakeLists.txt
+++ b/benchmark/iterable/CMakeLists.txt
@@ -9,7 +9,7 @@ foreach(method IN ITEMS at drop drop_until drop_while last)
         ENV "((1..50).to_a + (51..500).step(25).to_a).map { |n|
             xs = (1..n).to_a.map { |i| \"x<#{i}>{}\" }.join(', ')
             {
-                setup: '#include <boost/hana/tuple/iterable.hpp>',
+                setup: '#include <boost/hana/tuple.hpp>',
                 iterable: \"boost::hana::tuple(#{xs})\",
                 input_size: n
             }
@@ -23,7 +23,7 @@ foreach(method IN ITEMS at drop drop_until drop_while last)
             xs = (1..n).to_a.map { |i| \"x<#{i}>{}\" }.join(', ')
             {
                 setup: '
-                    #include <boost/hana/ext/std/tuple/iterable.hpp>
+                    #include <boost/hana/ext/std/tuple.hpp>
                     #include <tuple>
                 ',
                 iterable: \"std::make_tuple(#{xs})\",
@@ -37,7 +37,7 @@ foreach(method IN ITEMS at drop drop_until drop_while last)
         FILE "${method}.cpp"
         ENV "((1..50).to_a + (51..500).step(25).to_a).map { |n|
             {
-                setup: '#include <boost/hana/range/iterable.hpp>',
+                setup: '#include <boost/hana/range.hpp>',
                 iterable: \"::boost::hana::range_c<unsigned long, 0, #{n}>\",
                 input_size: n
             }
diff --git a/benchmark/iterable/at.cpp b/benchmark/iterable/at.cpp
index 4311450c8..a055b73bd 100644
--- a/benchmark/iterable/at.cpp
+++ b/benchmark/iterable/at.cpp
@@ -4,8 +4,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
+#include <boost/hana/fwd/iterable.hpp>
 #include <boost/hana/integral.hpp>
-#include <boost/hana/iterable/iterable.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/iterable/drop.cpp b/benchmark/iterable/drop.cpp
index 6b74aadee..47f29b5f6 100644
--- a/benchmark/iterable/drop.cpp
+++ b/benchmark/iterable/drop.cpp
@@ -4,8 +4,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
+#include <boost/hana/fwd/iterable.hpp>
 #include <boost/hana/integral.hpp>
-#include <boost/hana/iterable/iterable.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/iterable/drop_until.cpp b/benchmark/iterable/drop_until.cpp
index 9dd39b402..8c00a9548 100644
--- a/benchmark/iterable/drop_until.cpp
+++ b/benchmark/iterable/drop_until.cpp
@@ -4,8 +4,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/bool/logical.hpp>
-#include <boost/hana/iterable/iterable.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/fwd/iterable.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/iterable/drop_while.cpp b/benchmark/iterable/drop_while.cpp
index 017a58e77..6c9e19414 100644
--- a/benchmark/iterable/drop_while.cpp
+++ b/benchmark/iterable/drop_while.cpp
@@ -4,8 +4,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/bool/logical.hpp>
-#include <boost/hana/iterable/iterable.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/fwd/iterable.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/iterable/last.cpp b/benchmark/iterable/last.cpp
index 90494a3ae..663653f6b 100644
--- a/benchmark/iterable/last.cpp
+++ b/benchmark/iterable/last.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/iterable/iterable.hpp>
+#include <boost/hana/fwd/iterable.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/list/CMakeLists.txt b/benchmark/list/CMakeLists.txt
index db4180eb0..d57aefa4d 100644
--- a/benchmark/list/CMakeLists.txt
+++ b/benchmark/list/CMakeLists.txt
@@ -14,7 +14,7 @@ foreach(method IN ITEMS filter make permutations reverse scanl scanl1 scanr scan
                 {
                     setup: '
                         #include <boost/hana/integral.hpp>
-                        #include <boost/hana/tuple/list.hpp>
+                        #include <boost/hana/tuple.hpp>
                     ',
                     list: \"boost::hana::tuple(#{xs})\",
                     input_size: n
@@ -31,7 +31,7 @@ foreach(method IN ITEMS filter make permutations reverse scanl scanl1 scanr scan
                 }.join(', ')
                 {
                     setup: '
-                        #include <boost/hana/ext/std/tuple/list.hpp>
+                        #include <boost/hana/ext/std/tuple.hpp>
                         #include <boost/hana/integral.hpp>
                         #include <tuple>
                     ',
@@ -46,7 +46,7 @@ foreach(method IN ITEMS filter make permutations reverse scanl scanl1 scanr scan
         set(hana_tuple_env
             "((1..50).to_a + (51..500).step(25).to_a).map { |n|
                 {
-                    setup: '#include <boost/hana/tuple/list.hpp>',
+                    setup: '#include <boost/hana/tuple.hpp>',
                     datatype: 'boost::hana::Tuple',
                     input_size: n
                 }
@@ -59,10 +59,10 @@ foreach(method IN ITEMS filter make permutations reverse scanl scanl1 scanr scan
             "((1..50).to_a + (51..500).step(25).to_a).map { |n|
                 {
                     setup: '
-                        #include <boost/hana/ext/std/tuple/list.hpp>
+                        #include <boost/hana/ext/std/tuple.hpp>
                         #include <tuple>
                     ',
-                    datatype: 'boost::hana::StdTuple',
+                    datatype: 'boost::hana::ext::std::Tuple',
                     input_size: n
                 }
             }
@@ -74,7 +74,7 @@ foreach(method IN ITEMS filter make permutations reverse scanl scanl1 scanr scan
             "((1..50).to_a + (51..500).step(25).to_a).map { |n|
                 xs = (1..n).to_a.map { |i| \"x<#{i}>{}\" }.join(', ')
                 {
-                    setup: '#include <boost/hana/tuple/list.hpp>',
+                    setup: '#include <boost/hana/tuple.hpp>',
                     list: \"boost::hana::tuple(#{xs})\",
                     input_size: n
                 }
@@ -89,7 +89,7 @@ foreach(method IN ITEMS filter make permutations reverse scanl scanl1 scanr scan
                 xs = (1..n).to_a.map { |i| \"x<#{i}>{}\" }.join(', ')
                 {
                     setup: '
-                        #include <boost/hana/ext/std/tuple/list.hpp>
+                        #include <boost/hana/ext/std/tuple.hpp>
                         #include <tuple>
                     ',
                     list: \"std::make_tuple(#{xs})\",
diff --git a/benchmark/list/filter.cpp b/benchmark/list/filter.cpp
index 9ab2f99a1..d9e896d10 100644
--- a/benchmark/list/filter.cpp
+++ b/benchmark/list/filter.cpp
@@ -4,8 +4,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/bool/logical.hpp>
-#include <boost/hana/list/list.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/fwd/list.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/list/intersperse.cpp b/benchmark/list/intersperse.cpp
index 49d4b72d2..a796db42e 100644
--- a/benchmark/list/intersperse.cpp
+++ b/benchmark/list/intersperse.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/list/list.hpp>
+#include <boost/hana/fwd/list.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/list/make.cpp b/benchmark/list/make.cpp
index 33806c204..1d9d46722 100644
--- a/benchmark/list/make.cpp
+++ b/benchmark/list/make.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/list/list.hpp>
+#include <boost/hana/fwd/list.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/list/permutations.cpp b/benchmark/list/permutations.cpp
index d4d530163..7eff3258d 100644
--- a/benchmark/list/permutations.cpp
+++ b/benchmark/list/permutations.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/list/list.hpp>
+#include <boost/hana/fwd/list.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/list/reverse.cpp b/benchmark/list/reverse.cpp
index 24247e457..4fb94235f 100644
--- a/benchmark/list/reverse.cpp
+++ b/benchmark/list/reverse.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/list/list.hpp>
+#include <boost/hana/fwd/list.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/list/scanl.cpp b/benchmark/list/scanl.cpp
index 1b5176325..0bc5d4007 100644
--- a/benchmark/list/scanl.cpp
+++ b/benchmark/list/scanl.cpp
@@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0.
  */
 
 #include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/list/list.hpp>
+#include <boost/hana/fwd/list.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/list/scanl1.cpp b/benchmark/list/scanl1.cpp
index 325a05948..471bbec21 100644
--- a/benchmark/list/scanl1.cpp
+++ b/benchmark/list/scanl1.cpp
@@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0.
  */
 
 #include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/list/list.hpp>
+#include <boost/hana/fwd/list.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/list/scanr.cpp b/benchmark/list/scanr.cpp
index 5411d5013..37087376d 100644
--- a/benchmark/list/scanr.cpp
+++ b/benchmark/list/scanr.cpp
@@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0.
  */
 
 #include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/list/list.hpp>
+#include <boost/hana/fwd/list.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/list/scanr1.cpp b/benchmark/list/scanr1.cpp
index 34d213254..867fa25b1 100644
--- a/benchmark/list/scanr1.cpp
+++ b/benchmark/list/scanr1.cpp
@@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0.
  */
 
 #include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/list/list.hpp>
+#include <boost/hana/fwd/list.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/list/sort.cpp b/benchmark/list/sort.cpp
index c26930268..feb3394fd 100644
--- a/benchmark/list/sort.cpp
+++ b/benchmark/list/sort.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/list/list.hpp>
+#include <boost/hana/fwd/list.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/list/take.cpp b/benchmark/list/take.cpp
index e607adcb3..004134819 100644
--- a/benchmark/list/take.cpp
+++ b/benchmark/list/take.cpp
@@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0.
  */
 
 #include <boost/hana/integral.hpp>
-#include <boost/hana/list/list.hpp>
+#include <boost/hana/fwd/list.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/list/take_until.cpp b/benchmark/list/take_until.cpp
index d297b3c30..a86c3ce98 100644
--- a/benchmark/list/take_until.cpp
+++ b/benchmark/list/take_until.cpp
@@ -4,8 +4,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/bool/logical.hpp>
-#include <boost/hana/list/list.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/fwd/list.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/list/take_while.cpp b/benchmark/list/take_while.cpp
index 8c09a5e1d..bd3c5d6bf 100644
--- a/benchmark/list/take_while.cpp
+++ b/benchmark/list/take_while.cpp
@@ -4,8 +4,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/bool/logical.hpp>
-#include <boost/hana/list/list.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/fwd/list.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/list/zip_with.cpp b/benchmark/list/zip_with.cpp
index 49611989c..b2b79e0f9 100644
--- a/benchmark/list/zip_with.cpp
+++ b/benchmark/list/zip_with.cpp
@@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0.
  */
 
 #include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/list/list.hpp>
+#include <boost/hana/fwd/list.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/searchable/CMakeLists.txt b/benchmark/searchable/CMakeLists.txt
index 13d4544ff..87c11bd12 100644
--- a/benchmark/searchable/CMakeLists.txt
+++ b/benchmark/searchable/CMakeLists.txt
@@ -12,8 +12,8 @@ foreach(method IN ITEMS all any elem find lookup none subset)
                 }.join(', ')
                 {
                     setup: '
-                        #include <boost/hana/integral/comparable.hpp>
-                        #include <boost/hana/tuple/searchable.hpp>
+                        #include <boost/hana/integral.hpp>
+                        #include <boost/hana/tuple.hpp>
                     ',
                     searchable: \"boost::hana::tuple(#{xs})\",
                     input_size: n
@@ -28,8 +28,8 @@ foreach(method IN ITEMS all any elem find lookup none subset)
                 }.join(', ')
                 {
                     setup: '
-                        #include <boost/hana/ext/std/tuple/searchable.hpp>
-                        #include <boost/hana/integral/comparable.hpp>
+                        #include <boost/hana/ext/std/tuple.hpp>
+                        #include <boost/hana/integral.hpp>
                         #include <tuple>
                     ',
                     searchable: \"std::make_tuple(#{xs})\",
@@ -42,7 +42,7 @@ foreach(method IN ITEMS all any elem find lookup none subset)
             "((1..50).to_a + (51..500).step(25).to_a).map { |n|
                 xs = (1..n).to_a.map { |i| \"x<#{i}>{}\" }.join(', ')
                 {
-                    setup: '#include <boost/hana/tuple/searchable.hpp>',
+                    setup: '#include <boost/hana/tuple.hpp>',
                     searchable: \"boost::hana::tuple(#{xs})\",
                     input_size: n
                 }
@@ -54,7 +54,7 @@ foreach(method IN ITEMS all any elem find lookup none subset)
                 xs = (1..n).to_a.map { |i| \"x<#{i}>{}\" }.join(', ')
                 {
                     setup: '
-                        #include <boost/hana/ext/std/tuple/searchable.hpp>
+                        #include <boost/hana/ext/std/tuple.hpp>
                         #include <tuple>
                     ',
                     searchable: \"std::make_tuple(#{xs})\",
diff --git a/benchmark/searchable/all.cpp b/benchmark/searchable/all.cpp
index 8866ac07c..76be50a77 100644
--- a/benchmark/searchable/all.cpp
+++ b/benchmark/searchable/all.cpp
@@ -4,8 +4,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/bool/logical.hpp>
-#include <boost/hana/searchable/searchable.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/fwd/searchable.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/searchable/any.cpp b/benchmark/searchable/any.cpp
index edeadcb96..6df391990 100644
--- a/benchmark/searchable/any.cpp
+++ b/benchmark/searchable/any.cpp
@@ -4,8 +4,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/bool/logical.hpp>
-#include <boost/hana/searchable/searchable.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/fwd/searchable.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/searchable/elem.cpp b/benchmark/searchable/elem.cpp
index e8a96c04c..be9d39daf 100644
--- a/benchmark/searchable/elem.cpp
+++ b/benchmark/searchable/elem.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/searchable/searchable.hpp>
+#include <boost/hana/fwd/searchable.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/searchable/find.cpp b/benchmark/searchable/find.cpp
index 04804c7aa..394891c87 100644
--- a/benchmark/searchable/find.cpp
+++ b/benchmark/searchable/find.cpp
@@ -4,8 +4,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/bool/logical.hpp>
-#include <boost/hana/searchable/searchable.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/fwd/searchable.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/searchable/lookup.cpp b/benchmark/searchable/lookup.cpp
index 8422fb4bb..d7ac1872b 100644
--- a/benchmark/searchable/lookup.cpp
+++ b/benchmark/searchable/lookup.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/searchable/searchable.hpp>
+#include <boost/hana/fwd/searchable.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/searchable/none.cpp b/benchmark/searchable/none.cpp
index 66091af70..be72ab1e1 100644
--- a/benchmark/searchable/none.cpp
+++ b/benchmark/searchable/none.cpp
@@ -4,8 +4,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/bool/logical.hpp>
-#include <boost/hana/searchable/searchable.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/fwd/searchable.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/searchable/subset.cpp b/benchmark/searchable/subset.cpp
index 426c43e6f..b26864d8b 100644
--- a/benchmark/searchable/subset.cpp
+++ b/benchmark/searchable/subset.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/searchable/searchable.hpp>
+#include <boost/hana/fwd/searchable.hpp>
 
 #include "benchmark.hpp"
 
diff --git a/benchmark/vs/foldl/hana.cpp b/benchmark/vs/foldl/hana.cpp
index e1b536db3..026ed8f51 100644
--- a/benchmark/vs/foldl/hana.cpp
+++ b/benchmark/vs/foldl/hana.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/tuple/foldable.hpp>
+#include <boost/hana/tuple.hpp>
 
 #include "benchmark.hpp"
 #include <cstdlib>
diff --git a/example/core/disable.cpp b/example/core/disable.cpp
index 14d1abaeb..7e264c7a1 100644
--- a/example/core/disable.cpp
+++ b/example/core/disable.cpp
@@ -4,21 +4,22 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
+#include <boost/hana/core/disable.hpp>
 #include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/typeclass.hpp>
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/ext/std/tuple.hpp>
-#include <boost/hana/list/list.hpp>
+#include <boost/hana/foldable.hpp>
+#include <boost/hana/list.hpp>
 using namespace boost::hana;
 
 
 namespace boost { namespace hana {
     template <>
-    struct Foldable::instance<StdTuple> : disable { };
+    struct Foldable::instance<ext::std::Tuple> : disable { };
 }}
 
 // Usually, List should provide Foldable.
-BOOST_HANA_CONSTANT_ASSERT(is_a<List, StdTuple>);
-BOOST_HANA_CONSTANT_ASSERT(!is_a<Foldable, StdTuple>);
+BOOST_HANA_CONSTANT_ASSERT(is_a<List, ext::std::Tuple>);
+BOOST_HANA_CONSTANT_ASSERT(!is_a<Foldable, ext::std::Tuple>);
 
 int main() { }
diff --git a/example/core/is_a.cpp b/example/core/is_a.cpp
index 9058daf41..a8d3de720 100644
--- a/example/core/is_a.cpp
+++ b/example/core/is_a.cpp
@@ -5,17 +5,17 @@ Distributed under the Boost Software License, Version 1.0.
  */
 
 #include <boost/hana/bool.hpp>
-#include <boost/hana/comparable/comparable.hpp>
+#include <boost/hana/comparable.hpp>
 #include <boost/hana/core/is_a.hpp>
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
 #include <boost/hana/ext/std/tuple.hpp>
 #include <boost/hana/foreign.hpp>
 #include <boost/hana/integral.hpp>
-#include <boost/hana/iterable/iterable.hpp>
-#include <boost/hana/logical/logical.hpp>
+#include <boost/hana/iterable.hpp>
+#include <boost/hana/logical.hpp>
 #include <boost/hana/maybe.hpp>
-#include <boost/hana/monad/monad.hpp>
+#include <boost/hana/monad.hpp>
 #include <boost/hana/range.hpp>
 #include <boost/hana/tuple.hpp>
 
diff --git a/example/core/operators.cpp b/example/core/operators.cpp
index fdb79d2e4..25338c8c4 100644
--- a/example/core/operators.cpp
+++ b/example/core/operators.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/comparable/equal_mcd.hpp>
+#include <boost/hana/comparable.hpp>
 #include <boost/hana/core/operators.hpp>
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/foreign.hpp>
diff --git a/example/cppcon_2014/matrix/comparable.hpp b/example/cppcon_2014/matrix/comparable.hpp
index 5d0847265..882072d45 100644
--- a/example/cppcon_2014/matrix/comparable.hpp
+++ b/example/cppcon_2014/matrix/comparable.hpp
@@ -10,9 +10,9 @@ Distributed under the Boost Software License, Version 1.0.
 #include "matrix.hpp"
 
 #include <boost/hana/bool.hpp>
-#include <boost/hana/comparable/equal_mcd.hpp>
-#include <boost/hana/foldable/foldable.hpp>
-#include <boost/hana/list/list.hpp>
+#include <boost/hana/comparable.hpp>
+#include <boost/hana/foldable.hpp>
+#include <boost/hana/list.hpp>
 
 
 namespace boost { namespace hana {
diff --git a/example/cppcon_2014/matrix/det.hpp b/example/cppcon_2014/matrix/det.hpp
index 66ca6e1a7..7c5509b2b 100644
--- a/example/cppcon_2014/matrix/det.hpp
+++ b/example/cppcon_2014/matrix/det.hpp
@@ -7,20 +7,20 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_EXAMPLE_CPPCON_2014_MATRIX_DET_HPP
 #define BOOST_HANA_EXAMPLE_CPPCON_2014_MATRIX_DET_HPP
 
-#include <boost/hana/constant/constant.hpp>
-#include <boost/hana/foldable/foldable.hpp>
+#include <boost/hana/constant.hpp>
+#include <boost/hana/foldable.hpp>
 #include <boost/hana/functional/always.hpp>
 #include <boost/hana/functional/compose.hpp>
 #include <boost/hana/functional/fix.hpp>
 #include <boost/hana/functional/on.hpp>
 #include <boost/hana/functional/partial.hpp>
 #include <boost/hana/functional/placeholder.hpp>
-#include <boost/hana/functor/functor.hpp>
+#include <boost/hana/functor.hpp>
 #include <boost/hana/integral.hpp>
-#include <boost/hana/iterable/iterable.hpp>
-#include <boost/hana/list/list.hpp>
-#include <boost/hana/logical/logical.hpp>
-#include <boost/hana/monoid/monoid.hpp>
+#include <boost/hana/iterable.hpp>
+#include <boost/hana/list.hpp>
+#include <boost/hana/logical.hpp>
+#include <boost/hana/monoid.hpp>
 #include <boost/hana/range.hpp>
 #include <boost/hana/tuple.hpp>
 
diff --git a/example/cppcon_2014/matrix/functor.hpp b/example/cppcon_2014/matrix/functor.hpp
index 764fb862f..6d64ea145 100644
--- a/example/cppcon_2014/matrix/functor.hpp
+++ b/example/cppcon_2014/matrix/functor.hpp
@@ -11,7 +11,7 @@ Distributed under the Boost Software License, Version 1.0.
 
 #include <boost/hana/functional/flip.hpp>
 #include <boost/hana/functional/partial.hpp>
-#include <boost/hana/functor/fmap_mcd.hpp>
+#include <boost/hana/functor.hpp>
 
 #include <utility>
 
diff --git a/example/cppcon_2014/matrix/group.hpp b/example/cppcon_2014/matrix/group.hpp
index 3226240ad..79a3abb3b 100644
--- a/example/cppcon_2014/matrix/group.hpp
+++ b/example/cppcon_2014/matrix/group.hpp
@@ -9,7 +9,7 @@ Distributed under the Boost Software License, Version 1.0.
 
 #include "matrix.hpp"
 
-#include <boost/hana/group/minus_mcd.hpp>
+#include <boost/hana/group.hpp>
 
 #include <utility>
 
diff --git a/example/cppcon_2014/matrix/matrix.hpp b/example/cppcon_2014/matrix/matrix.hpp
index c0237638c..a3ffeff83 100644
--- a/example/cppcon_2014/matrix/matrix.hpp
+++ b/example/cppcon_2014/matrix/matrix.hpp
@@ -7,14 +7,14 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_EXAMPLE_CPPCON_2014_MATRIX_MATRIX_HPP
 #define BOOST_HANA_EXAMPLE_CPPCON_2014_MATRIX_MATRIX_HPP
 
-#include <boost/hana/comparable/operators.hpp>
-#include <boost/hana/constant/constant.hpp>
+#include <boost/hana/constant.hpp>
 #include <boost/hana/core/operators.hpp>
 #include <boost/hana/functional/on.hpp>
 #include <boost/hana/functional/partial.hpp>
-#include <boost/hana/group/operators.hpp>
-#include <boost/hana/monoid/operators.hpp>
-#include <boost/hana/ring/operators.hpp>
+#include <boost/hana/fwd/comparable.hpp>
+#include <boost/hana/fwd/group.hpp>
+#include <boost/hana/fwd/monoid.hpp>
+#include <boost/hana/fwd/ring.hpp>
 #include <boost/hana/tuple.hpp>
 
 #include <utility>
diff --git a/example/cppcon_2014/matrix/monoid.hpp b/example/cppcon_2014/matrix/monoid.hpp
index 8a3ffc8df..67bc31555 100644
--- a/example/cppcon_2014/matrix/monoid.hpp
+++ b/example/cppcon_2014/matrix/monoid.hpp
@@ -10,9 +10,9 @@ Distributed under the Boost Software License, Version 1.0.
 #include "matrix.hpp"
 
 #include <boost/hana/integral.hpp>
-#include <boost/hana/list/list.hpp>
-#include <boost/hana/monoid/mcd.hpp>
-#include <boost/hana/range/foldable.hpp>
+#include <boost/hana/list.hpp>
+#include <boost/hana/monoid.hpp>
+#include <boost/hana/range.hpp>
 
 
 namespace boost { namespace hana {
diff --git a/example/cppcon_2014/matrix/ring.hpp b/example/cppcon_2014/matrix/ring.hpp
index fd7cca388..7a6287d32 100644
--- a/example/cppcon_2014/matrix/ring.hpp
+++ b/example/cppcon_2014/matrix/ring.hpp
@@ -9,14 +9,14 @@ Distributed under the Boost Software License, Version 1.0.
 
 #include "matrix.hpp"
 
-#include <boost/hana/foldable/foldable.hpp>
+#include <boost/hana/foldable.hpp>
 #include <boost/hana/functional/always.hpp>
 #include <boost/hana/functional/on.hpp>
 #include <boost/hana/integral.hpp>
-#include <boost/hana/list/list.hpp>
-#include <boost/hana/range/foldable.hpp>
-#include <boost/hana/ring/mcd.hpp>
-#include <boost/hana/tuple/tuple.hpp>
+#include <boost/hana/list.hpp>
+#include <boost/hana/range.hpp>
+#include <boost/hana/ring.hpp>
+#include <boost/hana/tuple.hpp>
 
 #include <utility>
 
diff --git a/example/enumerable.cpp b/example/enumerable.cpp
index 9e885eed4..7ed339ade 100644
--- a/example/enumerable.cpp
+++ b/example/enumerable.cpp
@@ -5,10 +5,8 @@ Distributed under the Boost Software License, Version 1.0.
  */
 
 #include <boost/hana/detail/assert.hpp>
-#include <boost/hana/foreign/comparable.hpp>
-#include <boost/hana/foreign/enumerable.hpp>
-#include <boost/hana/integral/comparable.hpp>
-#include <boost/hana/integral/enumerable.hpp>
+#include <boost/hana/foreign.hpp>
+#include <boost/hana/integral.hpp>
 using namespace boost::hana;
 
 
diff --git a/example/integral_constant.cpp b/example/integral_constant.cpp
index 8cf70bdef..a77960a1b 100644
--- a/example/integral_constant.cpp
+++ b/example/integral_constant.cpp
@@ -20,7 +20,7 @@ int main() {
         );
 
         BOOST_HANA_CONSTANT_ASSERT(equal(
-            integral_constant<StdIntegralConstant, bool, true>,
+            integral_constant<ext::std::IntegralConstant, bool, true>,
             std::true_type{}
         ));
         //! [integral_constant]
diff --git a/example/list/applicative.cpp b/example/list/applicative.cpp
index d5b7cb018..5a179ba0e 100644
--- a/example/list/applicative.cpp
+++ b/example/list/applicative.cpp
@@ -19,7 +19,7 @@ using namespace boost::hana;
 int main() {
     //! [main]
     BOOST_HANA_CONSTEXPR_ASSERT(lift<Tuple>('x') == tuple('x'));
-    BOOST_HANA_CONSTEXPR_ASSERT(equal(lift<StdTuple>('x'), std::make_tuple('x')));
+    BOOST_HANA_CONSTEXPR_ASSERT(equal(lift<ext::std::Tuple>('x'), std::make_tuple('x')));
 
     BOOST_HANA_CONSTEXPR_LAMBDA auto f = pair;
     BOOST_HANA_CONSTEXPR_LAMBDA auto g = flip(pair);
diff --git a/example/record/howto.cpp b/example/record/howto.cpp
index fb115612c..8a150c2dc 100644
--- a/example/record/howto.cpp
+++ b/example/record/howto.cpp
@@ -13,10 +13,7 @@ Distributed under the Boost Software License, Version 1.0.
 #include <boost/hana/tuple.hpp>
 #include <boost/hana/type.hpp>
 
-#include <boost/hana/record/mcd.hpp>
-#include <boost/hana/comparable/record_mcd.hpp>
-#include <boost/hana/foldable/record_mcd.hpp>
-#include <boost/hana/searchable/record_mcd.hpp>
+#include <boost/hana/record.hpp>
 
 #include <string>
 #include <utility>
diff --git a/example/record/macros.cpp b/example/record/macros.cpp
index 909088942..d33eadb4d 100644
--- a/example/record/macros.cpp
+++ b/example/record/macros.cpp
@@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0.
  */
 
 #define BOOST_PP_VARIADICS 1
-#include <boost/hana/record/macros.hpp>
+#include <boost/hana/record_macros.hpp>
 #include <boost/hana/type.hpp>
 
 #include <string>
diff --git a/include/boost/hana/applicative.hpp b/include/boost/hana/applicative.hpp
index e4c21c2f3..8d8eb8418 100644
--- a/include/boost/hana/applicative.hpp
+++ b/include/boost/hana/applicative.hpp
@@ -10,8 +10,12 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_APPLICATIVE_HPP
 #define BOOST_HANA_APPLICATIVE_HPP
 
-#include <boost/hana/applicative/applicative.hpp>
-#include <boost/hana/applicative/list_mcd.hpp>
-#include <boost/hana/applicative/mcd.hpp>
+#include <boost/hana/fwd/applicative.hpp>
+
+
+namespace boost { namespace hana {
+    //! Minimal complete definition : `lift` and `ap`
+    struct Applicative::mcd { };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_APPLICATIVE_HPP
diff --git a/include/boost/hana/applicative/list_mcd.hpp b/include/boost/hana/applicative/list_mcd.hpp
deleted file mode 100644
index a65f9085a..000000000
--- a/include/boost/hana/applicative/list_mcd.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Applicative::list_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_APPLICATIVE_LIST_MCD_HPP
-#define BOOST_HANA_APPLICATIVE_LIST_MCD_HPP
-
-#include <boost/hana/applicative/applicative.hpp>
-
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/functor/functor.hpp>
-#include <boost/hana/list/list.hpp>
-#include <boost/hana/monad/monad.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition: `Functor` and `List`
-    template <typename T>
-    struct Applicative::list_mcd {
-        template <typename X>
-        static constexpr decltype(auto) lift_impl(X&& x)
-        { return cons(detail::std::forward<X>(x), nil<T>); }
-
-        template <typename Fs, typename Xs>
-        static constexpr decltype(auto) ap_impl(Fs&& fs, Xs&& xs) {
-            return bind(
-                detail::std::forward<Fs>(fs),
-                [xs(detail::std::forward<Xs>(xs))](auto&& f) -> decltype(auto) {
-                    return fmap(xs, detail::std::forward<decltype(f)>(f));
-                }
-            );
-        }
-    };
-
-    //! `Applicative` instance for instances of the `List` type class.
-    //!
-    //! A value can be lifted into a singleton list with `lift`. `ap(fs, xs)`
-    //! applies each function in the list `fs` to each value in the list `xs`,
-    //! and returns a list containing all the results.
-    //!
-    //! ### Example
-    //! @snippet example/list/applicative.cpp main
-    template <typename T>
-    struct Applicative::instance<T, when<is_a<List, T>()>>
-        : Applicative::list_mcd<T>
-    { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_APPLICATIVE_LIST_MCD_HPP
diff --git a/include/boost/hana/applicative/mcd.hpp b/include/boost/hana/applicative/mcd.hpp
deleted file mode 100644
index a88a67a00..000000000
--- a/include/boost/hana/applicative/mcd.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Applicative::mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_APPLICATIVE_MCD_HPP
-#define BOOST_HANA_APPLICATIVE_MCD_HPP
-
-#include <boost/hana/applicative/applicative.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition : `lift` and `ap`
-    struct Applicative::mcd { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_APPLICATIVE_MCD_HPP
diff --git a/include/boost/hana/bool.hpp b/include/boost/hana/bool.hpp
index 0d9c84531..d9f0e226a 100644
--- a/include/boost/hana/bool.hpp
+++ b/include/boost/hana/bool.hpp
@@ -10,11 +10,48 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_BOOL_HPP
 #define BOOST_HANA_BOOL_HPP
 
-#include <boost/hana/bool/bool.hpp>
+#include <boost/hana/fwd/bool.hpp>
 
-// Instances
-#include <boost/hana/bool/comparable.hpp>
-#include <boost/hana/bool/constant.hpp>
-#include <boost/hana/bool/logical.hpp>
+#include <boost/hana/functional/id.hpp>
+
+// instances
+#include <boost/hana/comparable.hpp>
+#include <boost/hana/constant.hpp>
+#include <boost/hana/logical.hpp>
+
+
+namespace boost { namespace hana {
+    template <>
+    struct Comparable::instance<Bool, Bool> : Comparable::equal_mcd {
+        template <typename X, typename Y>
+        static constexpr auto equal_impl(X const&, Y const&)
+        { return bool_<X::value == Y::value>; }
+    };
+
+    template <>
+    struct Constant::instance<Bool> : Constant::mcd {
+        template <typename C>
+        static constexpr auto value_impl(C const&)
+        { return C::value; }
+    };
+
+    template <>
+    struct Logical::instance<Bool> : Logical::mcd {
+        //! @bug
+        //! We can't use perfect forwarding because of this bug:
+        //! http://llvm.org/bugs/show_bug.cgi?id=20619
+        template <typename T, typename E>
+        static constexpr auto eval_if_impl(decltype(true_), T t, E)
+        { return t(id); }
+
+        template <typename T, typename E>
+        static constexpr auto eval_if_impl(decltype(false_), T, E e)
+        { return e(id); }
+
+        template <typename C>
+        static constexpr auto not_impl(C const&)
+        { return bool_<!C::value>; }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_BOOL_HPP
diff --git a/include/boost/hana/bool/comparable.hpp b/include/boost/hana/bool/comparable.hpp
deleted file mode 100644
index ff6109937..000000000
--- a/include/boost/hana/bool/comparable.hpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Comparable` for `boost::hana::Bool`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_BOOL_COMPARABLE_HPP
-#define BOOST_HANA_BOOL_COMPARABLE_HPP
-
-#include <boost/hana/bool/bool.hpp>
-#include <boost/hana/comparable/equal_mcd.hpp>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct Comparable::instance<Bool, Bool> : Comparable::equal_mcd {
-        template <typename X, typename Y>
-        static constexpr auto equal_impl(X const&, Y const&)
-        { return bool_<X::value == Y::value>; }
-    };
-}}
-
-#endif // !BOOST_HANA_BOOL_COMPARABLE_HPP
diff --git a/include/boost/hana/bool/constant.hpp b/include/boost/hana/bool/constant.hpp
deleted file mode 100644
index 9c9990397..000000000
--- a/include/boost/hana/bool/constant.hpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Constant` for `boost::hana::Bool`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_BOOL_CONSTANT_HPP
-#define BOOST_HANA_BOOL_CONSTANT_HPP
-
-#include <boost/hana/bool/bool.hpp>
-#include <boost/hana/constant/mcd.hpp>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct Constant::instance<Bool> : Constant::mcd {
-        template <typename C>
-        static constexpr auto value_impl(C const&)
-        { return C::value; }
-    };
-}}
-
-#endif // !BOOST_HANA_BOOL_CONSTANT_HPP
diff --git a/include/boost/hana/bool/logical.hpp b/include/boost/hana/bool/logical.hpp
deleted file mode 100644
index 62b4793b6..000000000
--- a/include/boost/hana/bool/logical.hpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Logical` for `boost::hana::Bool`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_BOOL_LOGICAL_HPP
-#define BOOST_HANA_BOOL_LOGICAL_HPP
-
-#include <boost/hana/bool/bool.hpp>
-#include <boost/hana/functional/id.hpp>
-#include <boost/hana/logical/mcd.hpp>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct Logical::instance<Bool> : Logical::mcd {
-        //! @bug
-        //! We can't use perfect forwarding because of this bug:
-        //! http://llvm.org/bugs/show_bug.cgi?id=20619
-        template <typename T, typename E>
-        static constexpr auto eval_if_impl(decltype(true_), T t, E)
-        { return t(id); }
-
-        template <typename T, typename E>
-        static constexpr auto eval_if_impl(decltype(false_), T, E e)
-        { return e(id); }
-
-        template <typename C>
-        static constexpr auto not_impl(C const&)
-        { return bool_<!C::value>; }
-    };
-}}
-
-#endif // !BOOST_HANA_BOOL_LOGICAL_HPP
diff --git a/include/boost/hana/comparable.hpp b/include/boost/hana/comparable.hpp
index 72d9bfe74..505ed3831 100644
--- a/include/boost/hana/comparable.hpp
+++ b/include/boost/hana/comparable.hpp
@@ -10,13 +10,86 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_COMPARABLE_HPP
 #define BOOST_HANA_COMPARABLE_HPP
 
-#include <boost/hana/comparable/comparable.hpp>
-#include <boost/hana/comparable/equal_mcd.hpp>
-#include <boost/hana/comparable/integral_constant_mcd.hpp>
-#include <boost/hana/comparable/list_mcd.hpp>
-#include <boost/hana/comparable/not_equal_mcd.hpp>
-#include <boost/hana/comparable/operators.hpp>
-#include <boost/hana/comparable/product_mcd.hpp>
-#include <boost/hana/comparable/record_mcd.hpp>
+#include <boost/hana/fwd/comparable.hpp>
+
+#include <boost/hana/core/datatype.hpp>
+#include <boost/hana/core/operators.hpp>
+#include <boost/hana/detail/std/enable_if.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+#include <boost/hana/logical.hpp>
+
+
+namespace boost { namespace hana {
+    namespace operators {
+        //! Equivalent to `equal`.
+        //! @relates boost::hana::Comparable
+        template <typename X, typename Y, typename = detail::std::enable_if_t<
+            enable_operators<Comparable, datatype_t<X>>::value ||
+            enable_operators<Comparable, datatype_t<Y>>::value
+        >>
+        constexpr decltype(auto) operator==(X&& x, Y&& y) {
+            return equal(detail::std::forward<X>(x),
+                         detail::std::forward<Y>(y));
+        }
+
+        //! Equivalent to `not_equal`.
+        //! @relates boost::hana::Comparable
+        template <typename X, typename Y, typename = detail::std::enable_if_t<
+            enable_operators<Comparable, datatype_t<X>>::value ||
+            enable_operators<Comparable, datatype_t<Y>>::value
+        >>
+        constexpr decltype(auto) operator!=(X&& x, Y&& y) {
+            return not_equal(detail::std::forward<X>(x),
+                             detail::std::forward<Y>(y));
+        }
+    }
+
+    //! Minimal complete definition : `equal`
+    struct Comparable::equal_mcd {
+        template <typename X, typename Y>
+        static constexpr decltype(auto) not_equal_impl(X&& x, Y&& y) {
+            return not_(equal(
+                detail::std::forward<X>(x),
+                detail::std::forward<Y>(y)
+            ));
+        }
+    };
+
+    //! Minimal complete definition : `not_equal`
+    struct Comparable::not_equal_mcd {
+        template <typename X, typename Y>
+        static constexpr decltype(auto) equal_impl(X&& x, Y&& y) {
+            return not_(not_equal(
+                detail::std::forward<X>(x),
+                detail::std::forward<Y>(y)
+            ));
+        }
+    };
+}} // end namespace boost::hana
+
+#include <boost/hana/bool.hpp>
+#include <boost/hana/core/disable.hpp>
+
+namespace boost { namespace hana {
+    //! Default instance for the `Comparable` type class.
+    //!
+    //! Objects of different data types that do not define a `Comparable`
+    //! instance are implicitly `Comparable` by letting any two such objects
+    //! always compare unequal. However, objects of the same data type are
+    //! not implicitly `Comparable`, and trying to compare two objects of
+    //! the same data type that do not define a `Comparable` instance will
+    //! result in a compile-time error.
+    template <typename T, typename U>
+    struct Comparable::default_instance : Comparable::equal_mcd {
+        template <typename X, typename Y>
+        static constexpr auto equal_impl(X const&, Y const&)
+        { return false_; }
+    };
+
+    template <typename T>
+    struct Comparable::default_instance<T, T> : disable {
+        // We let it fail if T is not comparable with itself.
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_COMPARABLE_HPP
diff --git a/include/boost/hana/comparable/default.hpp b/include/boost/hana/comparable/default.hpp
deleted file mode 100644
index fc8fb17cf..000000000
--- a/include/boost/hana/comparable/default.hpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*!
-@file
-Defines the default instance for `boost::hana::Comparable`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_COMPARABLE_DEFAULT_HPP
-#define BOOST_HANA_COMPARABLE_DEFAULT_HPP
-
-#include <boost/hana/bool.hpp>
-#include <boost/hana/comparable/equal_mcd.hpp>
-#include <boost/hana/core/disable.hpp>
-
-
-namespace boost { namespace hana {
-    //! Default instance for the `Comparable` type class.
-    //!
-    //! Objects of different data types that do not define a `Comparable`
-    //! instance are implicitly `Comparable` by letting any two such objects
-    //! always compare unequal. However, objects of the same data type are
-    //! not implicitly `Comparable`, and trying to compare two objects of
-    //! the same data type that do not define a `Comparable` instance will
-    //! result in a compile-time error.
-    template <typename T, typename U>
-    struct Comparable::default_instance : Comparable::equal_mcd {
-        template <typename X, typename Y>
-        static constexpr auto equal_impl(X const&, Y const&)
-        { return false_; }
-    };
-
-    template <typename T>
-    struct Comparable::default_instance<T, T> : disable {
-        // We let it fail if T is not comparable with itself.
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_COMPARABLE_DEFAULT_HPP
diff --git a/include/boost/hana/comparable/equal_mcd.hpp b/include/boost/hana/comparable/equal_mcd.hpp
deleted file mode 100644
index d736ecc33..000000000
--- a/include/boost/hana/comparable/equal_mcd.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Comparable::equal_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_COMPARABLE_EQUAL_MCD_HPP
-#define BOOST_HANA_COMPARABLE_EQUAL_MCD_HPP
-
-#include <boost/hana/comparable/comparable.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/logical/logical.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition : `equal`
-    struct Comparable::equal_mcd {
-        template <typename X, typename Y>
-        static constexpr decltype(auto) not_equal_impl(X&& x, Y&& y) {
-            return not_(equal(
-                detail::std::forward<X>(x),
-                detail::std::forward<Y>(y)
-            ));
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_COMPARABLE_EQUAL_MCD_HPP
-
-#include <boost/hana/comparable/default.hpp> //! @todo remove this include
diff --git a/include/boost/hana/comparable/integral_constant_mcd.hpp b/include/boost/hana/comparable/integral_constant_mcd.hpp
deleted file mode 100644
index 1e79bba2b..000000000
--- a/include/boost/hana/comparable/integral_constant_mcd.hpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Comparable::integral_constant_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_COMPARABLE_INTEGRAL_CONSTANT_MCD_HPP
-#define BOOST_HANA_COMPARABLE_INTEGRAL_CONSTANT_MCD_HPP
-
-#include <boost/hana/comparable/equal_mcd.hpp>
-#include <boost/hana/constant/constant.hpp>
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/detail/std/is_integral.hpp>
-#include <boost/hana/integral_constant/integral_constant.hpp>
-#include <boost/hana/logical/integral_constant_mcd.hpp>
-
-
-namespace boost { namespace hana {
-    template <typename I1, typename I2>
-    struct Comparable::integral_constant_mcd : Comparable::equal_mcd {
-        template <typename X, typename Y>
-        static constexpr decltype(auto) equal_impl(X x, Y y) {
-            constexpr auto eq = value(x) == value(y);
-            return integral_constant<I1, decltype(eq), eq>;
-        }
-    };
-
-    template <typename I, typename T>
-    struct Comparable::instance<I, T, when<
-        is_an<IntegralConstant, I>() &&
-        detail::std::is_integral<T>{}
-    >>
-        : Comparable::equal_mcd
-    {
-        template <typename X, typename Y>
-        static constexpr decltype(auto) equal_impl(X&& x, Y&& y) {
-            return value(detail::std::forward<X>(x)) ==
-                   detail::std::forward<Y>(y);
-        }
-    };
-
-    template <typename T, typename I>
-    struct Comparable::instance<T, I, when<
-        detail::std::is_integral<T>{} &&
-        is_an<IntegralConstant, I>()
-    >>
-        : Comparable::equal_mcd
-    {
-        template <typename X, typename Y>
-        static constexpr decltype(auto) equal_impl(X&& x, Y&& y) {
-            return detail::std::forward<X>(x) ==
-                   value(detail::std::forward<Y>(y));
-        }
-    };
-
-    template <typename I1, typename I2>
-    struct Comparable::instance<I1, I2, when<
-        is_an<IntegralConstant, I1>() &&
-        is_an<IntegralConstant, I2>()
-    >>
-        : Comparable::integral_constant_mcd<I1, I2>
-    { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_COMPARABLE_INTEGRAL_CONSTANT_MCD_HPP
diff --git a/include/boost/hana/comparable/list_mcd.hpp b/include/boost/hana/comparable/list_mcd.hpp
deleted file mode 100644
index 35f113dea..000000000
--- a/include/boost/hana/comparable/list_mcd.hpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Comparable::list_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_COMPARABLE_LIST_MCD_HPP
-#define BOOST_HANA_COMPARABLE_LIST_MCD_HPP
-
-#include <boost/hana/comparable/equal_mcd.hpp>
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/iterable/iterable.hpp>
-#include <boost/hana/list/list.hpp>
-#include <boost/hana/logical/logical.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition: `List`
-    struct Comparable::list_mcd
-        : Comparable::equal_mcd
-    {
-        template <typename Xs, typename Ys>
-        static constexpr decltype(auto) equal_impl(Xs const& xs, Ys const& ys) {
-            return eval_if(or_(is_empty(xs), is_empty(ys)),
-                [&xs, &ys](auto _) -> decltype(auto) {
-                    return and_(_(is_empty)(xs), _(is_empty)(ys));
-                },
-                [&xs, &ys](auto _) -> decltype(auto) {
-                    return and_(equal(_(head)(xs), _(head)(ys)),
-                                equal_impl(_(tail)(xs), _(tail)(ys)));
-                }
-            );
-        }
-    };
-
-    //! Instance of `Comparable` for instances of `List`.
-    //!
-    //! Two `List`s are equal if and only if they contain the same number
-    //! of elements and their elements at any given index are equal.
-    //!
-    //! ### Example
-    //! @snippet example/list/comparable.cpp main
-    template <typename T, typename U>
-    struct Comparable::instance<T, U, when<
-        is_a<List, T>() && is_a<List, U>()
-    >>
-        : Comparable::list_mcd
-    { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_COMPARABLE_LIST_MCD_HPP
-
-#include <boost/hana/comparable/default.hpp> //! @todo remove this include
diff --git a/include/boost/hana/comparable/not_equal_mcd.hpp b/include/boost/hana/comparable/not_equal_mcd.hpp
deleted file mode 100644
index 716fd012f..000000000
--- a/include/boost/hana/comparable/not_equal_mcd.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Comparable::not_equal_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_COMPARABLE_NOT_EQUAL_MCD_HPP
-#define BOOST_HANA_COMPARABLE_NOT_EQUAL_MCD_HPP
-
-#include <boost/hana/comparable/comparable.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/logical/logical.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition : `not_equal`
-    struct Comparable::not_equal_mcd {
-        template <typename X, typename Y>
-        static constexpr decltype(auto) equal_impl(X&& x, Y&& y) {
-            return not_(not_equal(
-                detail::std::forward<X>(x),
-                detail::std::forward<Y>(y)
-            ));
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_COMPARABLE_NOT_EQUAL_MCD_HPP
-
-#include <boost/hana/comparable/default.hpp> //! @todo remove this include
diff --git a/include/boost/hana/comparable/operators.hpp b/include/boost/hana/comparable/operators.hpp
deleted file mode 100644
index c174a046b..000000000
--- a/include/boost/hana/comparable/operators.hpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*!
-@file
-Defines custom operators for `boost::hana::Comparable`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_COMPARABLE_OPERATORS_HPP
-#define BOOST_HANA_COMPARABLE_OPERATORS_HPP
-
-#include <boost/hana/comparable/comparable.hpp>
-
-#include <boost/hana/core/datatype.hpp>
-#include <boost/hana/core/operators.hpp>
-#include <boost/hana/detail/std/enable_if.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-
-
-namespace boost { namespace hana { namespace operators {
-    //! Equivalent to `equal`.
-    //! @relates boost::hana::Comparable
-    template <typename X, typename Y, typename = detail::std::enable_if_t<
-        enable_operators<Comparable, datatype_t<X>>::value ||
-        enable_operators<Comparable, datatype_t<Y>>::value
-    >>
-    constexpr decltype(auto) operator==(X&& x, Y&& y) {
-        return equal(detail::std::forward<X>(x),
-                     detail::std::forward<Y>(y));
-    }
-
-    //! Equivalent to `not_equal`.
-    //! @relates boost::hana::Comparable
-    template <typename X, typename Y, typename = detail::std::enable_if_t<
-        enable_operators<Comparable, datatype_t<X>>::value ||
-        enable_operators<Comparable, datatype_t<Y>>::value
-    >>
-    constexpr decltype(auto) operator!=(X&& x, Y&& y) {
-        return not_equal(detail::std::forward<X>(x),
-                         detail::std::forward<Y>(y));
-    }
-}}} // end namespace boost::hana::operators
-
-#endif // !BOOST_HANA_COMPARABLE_OPERATORS_HPP
diff --git a/include/boost/hana/comparable/product_mcd.hpp b/include/boost/hana/comparable/product_mcd.hpp
deleted file mode 100644
index c270ec798..000000000
--- a/include/boost/hana/comparable/product_mcd.hpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Comparable::product_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_COMPARABLE_PRODUCT_MCD_HPP
-#define BOOST_HANA_COMPARABLE_PRODUCT_MCD_HPP
-
-#include <boost/hana/comparable/equal_mcd.hpp>
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/logical/logical.hpp>
-#include <boost/hana/product/product.hpp>
-
-
-namespace boost { namespace hana {
-    //! Mininal complete definition: `Product`
-    struct Comparable::product_mcd : Comparable::equal_mcd {
-        template <typename X, typename Y>
-        static constexpr decltype(auto) equal_impl(X const& x, Y const& y) {
-            return and_(
-                equal(first(x), first(y)),
-                equal(second(x), second(y))
-            );
-        }
-    };
-
-    //! Instance of `Comparable` for `Product`s.
-    //!
-    //! Two products `x` and `y` are equal iff they are equal element-wise,
-    //! i.e. iff
-    //! @code
-    //!     first(x) == first(y) && second(x) == second(y)
-    //! @endcode
-    //!
-    //! ### Example
-    //! @snippet example/product.cpp comparable
-    template <typename T, typename U>
-    struct Comparable::instance<T, U, when<
-        is_a<Product, T>() && is_a<Product, U>()
-    >> : Comparable::product_mcd { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_COMPARABLE_PRODUCT_MCD_HPP
diff --git a/include/boost/hana/comparable/record_mcd.hpp b/include/boost/hana/comparable/record_mcd.hpp
deleted file mode 100644
index 8d24dc651..000000000
--- a/include/boost/hana/comparable/record_mcd.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Comparable::record_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_COMPARABLE_RECORD_MCD_HPP
-#define BOOST_HANA_COMPARABLE_RECORD_MCD_HPP
-
-#include <boost/hana/comparable/equal_mcd.hpp>
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/product/product.hpp>
-#include <boost/hana/record/record.hpp>
-#include <boost/hana/searchable/searchable.hpp>
-
-
-namespace boost { namespace hana {
-    template <typename R>
-    struct Comparable::record_mcd : Comparable::equal_mcd {
-        template <typename X, typename Y>
-        static constexpr decltype(auto) equal_impl(X const& x, Y const& y) {
-            return all(members<R>, [&x, &y](auto&& member) -> decltype(auto) {
-                auto accessor = second(detail::std::forward<decltype(member)>(member));
-                return equal(accessor(x), accessor(y));
-            });
-        }
-    };
-
-    //! Two `Records` of the same data type `R` are equal if and only if
-    //! all their members are equal. The members are compared in the
-    //! same order as they appear in `members<R>`.
-    template <typename R>
-    struct Comparable::instance<R, R, when<is_a<Record, R>()>>
-        : Comparable::record_mcd<R>
-    { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_COMPARABLE_RECORD_MCD_HPP
diff --git a/include/boost/hana/constant.hpp b/include/boost/hana/constant.hpp
index 284549de5..dd097a8f5 100644
--- a/include/boost/hana/constant.hpp
+++ b/include/boost/hana/constant.hpp
@@ -10,7 +10,12 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_CONSTANT_HPP
 #define BOOST_HANA_CONSTANT_HPP
 
-#include <boost/hana/constant/constant.hpp>
-#include <boost/hana/constant/mcd.hpp>
+#include <boost/hana/fwd/constant.hpp>
+
+
+namespace boost { namespace hana {
+    //! Minimal complete definition: `value`
+    struct Constant::mcd { };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_CONSTANT_HPP
diff --git a/include/boost/hana/constant/mcd.hpp b/include/boost/hana/constant/mcd.hpp
deleted file mode 100644
index 0c3bf1a9e..000000000
--- a/include/boost/hana/constant/mcd.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Constant::mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_CONSTANT_MCD_HPP
-#define BOOST_HANA_CONSTANT_MCD_HPP
-
-#include <boost/hana/constant/constant.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition: `value`
-    struct Constant::mcd { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_CONSTANT_MCD_HPP
diff --git a/include/boost/hana/core/is_a.hpp b/include/boost/hana/core/is_a.hpp
index bc1554349..fc488d895 100644
--- a/include/boost/hana/core/is_a.hpp
+++ b/include/boost/hana/core/is_a.hpp
@@ -10,9 +10,9 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_CORE_IS_A_HPP
 #define BOOST_HANA_CORE_IS_A_HPP
 
-#include <boost/hana/bool/bool.hpp>
 #include <boost/hana/core/datatype.hpp>
 #include <boost/hana/core/disable.hpp>
+#include <boost/hana/fwd/bool.hpp>
 
 
 namespace boost { namespace hana {
diff --git a/include/boost/hana/detail/assert.hpp b/include/boost/hana/detail/assert.hpp
index aa359f512..a0d950c01 100644
--- a/include/boost/hana/detail/assert.hpp
+++ b/include/boost/hana/detail/assert.hpp
@@ -10,7 +10,7 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_DETAIL_ASSERT_HPP
 #define BOOST_HANA_DETAIL_ASSERT_HPP
 
-#include <boost/hana/constant/constant.hpp>
+#include <boost/hana/constant.hpp>
 #include <boost/hana/core/is_a.hpp>
 
 #include <cstdio>
diff --git a/include/boost/hana/detail/variadic/foldl.hpp b/include/boost/hana/detail/variadic/foldl.hpp
index db2d6cd23..e69d9beda 100644
--- a/include/boost/hana/detail/variadic/foldl.hpp
+++ b/include/boost/hana/detail/variadic/foldl.hpp
@@ -14,7 +14,7 @@ Distributed under the Boost Software License, Version 1.0.
 
 #include <boost/hana/core/datatype.hpp>
 #include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/type/type.hpp>
+#include <boost/hana/fwd/type.hpp>
 
 
 namespace boost { namespace hana { namespace detail { namespace variadic {
diff --git a/include/boost/hana/detail/variadic/foldl1.hpp b/include/boost/hana/detail/variadic/foldl1.hpp
index e2a689a8f..e51b4ad6f 100644
--- a/include/boost/hana/detail/variadic/foldl1.hpp
+++ b/include/boost/hana/detail/variadic/foldl1.hpp
@@ -13,7 +13,7 @@ Distributed under the Boost Software License, Version 1.0.
 #include <boost/hana/core/datatype.hpp>
 #include <boost/hana/detail/std/forward.hpp>
 #include <boost/hana/functional/id.hpp>
-#include <boost/hana/type/type.hpp>
+#include <boost/hana/fwd/type.hpp>
 
 
 namespace boost { namespace hana { namespace detail { namespace variadic {
diff --git a/include/boost/hana/detail/variadic/foldr.hpp b/include/boost/hana/detail/variadic/foldr.hpp
index e825d3547..8b4edc123 100644
--- a/include/boost/hana/detail/variadic/foldr.hpp
+++ b/include/boost/hana/detail/variadic/foldr.hpp
@@ -14,7 +14,7 @@ Distributed under the Boost Software License, Version 1.0.
 
 #include <boost/hana/core/datatype.hpp>
 #include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/type/type.hpp>
+#include <boost/hana/fwd/type.hpp>
 
 
 namespace boost { namespace hana { namespace detail { namespace variadic {
diff --git a/include/boost/hana/detail/variadic/foldr1.hpp b/include/boost/hana/detail/variadic/foldr1.hpp
index 51ae59de9..ee99d6c92 100644
--- a/include/boost/hana/detail/variadic/foldr1.hpp
+++ b/include/boost/hana/detail/variadic/foldr1.hpp
@@ -12,7 +12,7 @@ Distributed under the Boost Software License, Version 1.0.
 
 #include <boost/hana/core/datatype.hpp>
 #include <boost/hana/functional/id.hpp>
-#include <boost/hana/type/type.hpp>
+#include <boost/hana/fwd/type.hpp>
 
 
 namespace boost { namespace hana { namespace detail { namespace variadic {
diff --git a/include/boost/hana/either.hpp b/include/boost/hana/either.hpp
index 7560bfcdd..c8215c87d 100644
--- a/include/boost/hana/either.hpp
+++ b/include/boost/hana/either.hpp
@@ -10,13 +10,118 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_EITHER_HPP
 #define BOOST_HANA_EITHER_HPP
 
-#include <boost/hana/either/either.hpp>
+#include <boost/hana/fwd/either.hpp>
 
-// Instances
-#include <boost/hana/either/functor.hpp>
-#include <boost/hana/either/applicative.hpp>
-#include <boost/hana/either/monad.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+#include <boost/hana/functional/id.hpp>
 
-#include <boost/hana/either/comparable.hpp>
+// instances
+#include <boost/hana/applicative.hpp>
+#include <boost/hana/comparable.hpp>
+#include <boost/hana/functor.hpp>
+#include <boost/hana/monad.hpp>
+
+
+namespace boost { namespace hana {
+    //! Instance of `Comparable` for `Either`s.
+    //!
+    //! Two `Either`s are equal if and only if they both contain left values
+    //! or they both contain right values and those values are equal.
+    //!
+    //! ### Example
+    //! @snippet example/either.cpp comparable
+    template <>
+    struct Comparable::instance<Either, Either> : Comparable::equal_mcd {
+        template <template <typename ...> class E, typename T, typename U>
+        static constexpr decltype(auto) equal_impl(E<T> const& x, E<U> const& y) {
+            return equal(x.value, y.value);
+        }
+
+        template <template <typename ...> class E1,
+                  template <typename ...> class E2, typename T, typename U>
+        static constexpr auto equal_impl(E1<T> const&, E2<U> const&)
+        { return false_; }
+    };
+
+    //! Instance of `Functor` for `Either`s.
+    //!
+    //! Since `Either` can contain one of two possible values of different
+    //! data types and `fmap` accepts a single function, `Either`'s instance
+    //! of `Functor` can only map the function over one arbitrarily-defined
+    //! side of the `Either`. Hence, mapping a function over an `Either e`
+    //! does nothing if `e` contains a left value, and it applies the function
+    //! if `e` contains a right value. In other words:
+    //! @code
+    //!     fmap(left(x), f) == left(x)
+    //!     fmap(right(x), f) == right(f(x))
+    //! @endcode
+    //!
+    //! ### Example
+    //! @snippet example/either.cpp functor
+    template <>
+    struct Functor::instance<Either> : Functor::fmap_mcd {
+        template <typename E, typename F>
+        static constexpr decltype(auto) fmap_impl(E&& e, F&& f) {
+            return either(
+                left,
+                [f(detail::std::forward<F>(f))](auto&& x) -> decltype(auto) {
+                    return right(f(detail::std::forward<decltype(x)>(x)));
+                },
+                detail::std::forward<E>(e)
+            );
+        }
+    };
+
+    //! Instance of `Applicative` for `Either`.
+    //!
+    //! The instance of `Applicative` for `Either` follows naturally from
+    //! the instance of `Functor`. Specifically,
+    //! @code
+    //!     ap(left(x), anything) == left(x)
+    //!     ap(right(x), left(anything)) == right(x)
+    //!     ap(right(f), right(x)) == right(f(x))
+    //!     lift<Either>(x) == right(x)
+    //! @endcode
+    //!
+    //! ### Example
+    //! @include example/either/applicative.cpp
+    template <>
+    struct Applicative::instance<Either> : Applicative::mcd {
+        template <typename X>
+        static constexpr decltype(auto) lift_impl(X&& x)
+        { return right(detail::std::forward<X>(x)); }
+
+        template <typename E, typename X>
+        static constexpr decltype(auto) ap_impl(E&& e, X&& x) {
+            return either(
+                left,
+                [x(detail::std::forward<X>(x))](auto&& f) -> decltype(auto) {
+                    return fmap(x, detail::std::forward<decltype(f)>(f));
+                },
+                detail::std::forward<E>(e)
+            );
+        }
+    };
+
+    //! Instance of `Monad` for `Either`.
+    //!
+    //! The instance of `Monad` for `Either` follows naturally from
+    //! the instance of `Applicative`. Specifically,
+    //! @code
+    //!     flatten(right(right(x))) == right(x)
+    //!     flatten(anything else) == anything else
+    //! @endcode
+    //!
+    //! ### Example
+    //! @snippet example/either.cpp monad
+    template <>
+    struct Monad::instance<Either> : Monad::flatten_mcd<Either> {
+        template <typename E>
+        static constexpr decltype(auto) flatten_impl(E&& e) {
+            return either(left, id, detail::std::forward<E>(e));
+        }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_EITHER_HPP
diff --git a/include/boost/hana/either/applicative.hpp b/include/boost/hana/either/applicative.hpp
deleted file mode 100644
index 5bc7fb099..000000000
--- a/include/boost/hana/either/applicative.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Applicative` for `boost::hana::Either`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EITHER_APPLICATIVE_HPP
-#define BOOST_HANA_EITHER_APPLICATIVE_HPP
-
-#include <boost/hana/applicative/mcd.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/either/either.hpp>
-
-// Mcd
-#include <boost/hana/either/functor.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Applicative` for `Either`.
-    //!
-    //! The instance of `Applicative` for `Either` follows naturally from
-    //! the instance of `Functor`. Specifically,
-    //! @code
-    //!     ap(left(x), anything) == left(x)
-    //!     ap(right(x), left(anything)) == right(x)
-    //!     ap(right(f), right(x)) == right(f(x))
-    //!     lift<Either>(x) == right(x)
-    //! @endcode
-    //!
-    //! ### Example
-    //! @include example/either/applicative.cpp
-    template <>
-    struct Applicative::instance<Either> : Applicative::mcd {
-        template <typename X>
-        static constexpr decltype(auto) lift_impl(X&& x)
-        { return right(detail::std::forward<X>(x)); }
-
-        template <typename E, typename X>
-        static constexpr decltype(auto) ap_impl(E&& e, X&& x) {
-            return either(
-                left,
-                [x(detail::std::forward<X>(x))](auto&& f) -> decltype(auto) {
-                    return fmap(x, detail::std::forward<decltype(f)>(f));
-                },
-                detail::std::forward<E>(e)
-            );
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EITHER_APPLICATIVE_HPP
diff --git a/include/boost/hana/either/comparable.hpp b/include/boost/hana/either/comparable.hpp
deleted file mode 100644
index 2dda0a5ba..000000000
--- a/include/boost/hana/either/comparable.hpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Comparable` for `boost::hana::Either`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EITHER_COMPARABLE_HPP
-#define BOOST_HANA_EITHER_COMPARABLE_HPP
-
-#include <boost/hana/bool.hpp>
-#include <boost/hana/comparable/equal_mcd.hpp>
-#include <boost/hana/either/either.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Comparable` for `Either`s.
-    //!
-    //! Two `Either`s are equal if and only if they both contain left values
-    //! or they both contain right values and those values are equal.
-    //!
-    //! ### Example
-    //! @snippet example/either.cpp comparable
-    template <>
-    struct Comparable::instance<Either, Either> : Comparable::equal_mcd {
-        template <template <typename ...> class E, typename T, typename U>
-        static constexpr decltype(auto) equal_impl(E<T> const& x, E<U> const& y) {
-            return equal(x.value, y.value);
-        }
-
-        template <template <typename ...> class E1,
-                  template <typename ...> class E2, typename T, typename U>
-        static constexpr auto equal_impl(E1<T> const&, E2<U> const&)
-        { return false_; }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EITHER_COMPARABLE_HPP
diff --git a/include/boost/hana/either/functor.hpp b/include/boost/hana/either/functor.hpp
deleted file mode 100644
index 12c8b2be4..000000000
--- a/include/boost/hana/either/functor.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Functor` for `boost::hana::Either`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EITHER_FUNCTOR_HPP
-#define BOOST_HANA_EITHER_FUNCTOR_HPP
-
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/either/either.hpp>
-#include <boost/hana/functor/fmap_mcd.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Functor` for `Either`s.
-    //!
-    //! Since `Either` can contain one of two possible values of different
-    //! data types and `fmap` accepts a single function, `Either`'s instance
-    //! of `Functor` can only map the function over one arbitrarily-defined
-    //! side of the `Either`. Hence, mapping a function over an `Either e`
-    //! does nothing if `e` contains a left value, and it applies the function
-    //! if `e` contains a right value. In other words:
-    //! @code
-    //!     fmap(left(x), f) == left(x)
-    //!     fmap(right(x), f) == right(f(x))
-    //! @endcode
-    //!
-    //! ### Example
-    //! @snippet example/either.cpp functor
-    template <>
-    struct Functor::instance<Either> : Functor::fmap_mcd {
-        template <typename E, typename F>
-        static constexpr decltype(auto) fmap_impl(E&& e, F&& f) {
-            return either(
-                left,
-                [f(detail::std::forward<F>(f))](auto&& x) -> decltype(auto) {
-                    return right(f(detail::std::forward<decltype(x)>(x)));
-                },
-                detail::std::forward<E>(e)
-            );
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EITHER_FUNCTOR_HPP
diff --git a/include/boost/hana/either/monad.hpp b/include/boost/hana/either/monad.hpp
deleted file mode 100644
index af48316e2..000000000
--- a/include/boost/hana/either/monad.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Monad` for `boost::hana::Either`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EITHER_MONAD_HPP
-#define BOOST_HANA_EITHER_MONAD_HPP
-
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/either/either.hpp>
-#include <boost/hana/functional/id.hpp>
-#include <boost/hana/monad/flatten_mcd.hpp>
-
-// Mcd
-#include <boost/hana/either/applicative.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Monad` for `Either`.
-    //!
-    //! The instance of `Monad` for `Either` follows naturally from
-    //! the instance of `Applicative`. Specifically,
-    //! @code
-    //!     flatten(right(right(x))) == right(x)
-    //!     flatten(anything else) == anything else
-    //! @endcode
-    //!
-    //! ### Example
-    //! @snippet example/either.cpp monad
-    template <>
-    struct Monad::instance<Either> : Monad::flatten_mcd<Either> {
-        template <typename E>
-        static constexpr decltype(auto) flatten_impl(E&& e) {
-            return either(left, id, detail::std::forward<E>(e));
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EITHER_MONAD_HPP
diff --git a/include/boost/hana/enumerable.hpp b/include/boost/hana/enumerable.hpp
index 9b67075ae..9ae74f3c7 100644
--- a/include/boost/hana/enumerable.hpp
+++ b/include/boost/hana/enumerable.hpp
@@ -10,8 +10,12 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_ENUMERABLE_HPP
 #define BOOST_HANA_ENUMERABLE_HPP
 
-#include <boost/hana/enumerable/enumerable.hpp>
-#include <boost/hana/enumerable/integral_constant_mcd.hpp>
-#include <boost/hana/enumerable/mcd.hpp>
+#include <boost/hana/fwd/enumerable.hpp>
+
+
+namespace boost { namespace hana {
+    //! Minimal complete definition : `succ` and `pred`
+    struct Enumerable::mcd { };
+}}
 
 #endif // !BOOST_HANA_ENUMERABLE_HPP
diff --git a/include/boost/hana/enumerable/integral_constant_mcd.hpp b/include/boost/hana/enumerable/integral_constant_mcd.hpp
deleted file mode 100644
index fa54499fc..000000000
--- a/include/boost/hana/enumerable/integral_constant_mcd.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Enumerable::integral_constant_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_ENUMERABLE_INTEGRAL_CONSTANT_MCD_HPP
-#define BOOST_HANA_ENUMERABLE_INTEGRAL_CONSTANT_MCD_HPP
-
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/enumerable/mcd.hpp>
-#include <boost/hana/integral_constant/integral_constant.hpp>
-
-
-namespace boost { namespace hana {
-    template <typename I>
-    struct Enumerable::integral_constant_mcd : Enumerable::mcd {
-    private:
-        template <typename X> static constexpr auto inc(X x) { return ++x; }
-        template <typename X> static constexpr auto dec(X x) { return --x; }
-
-    public:
-        template <typename X>
-        static constexpr decltype(auto) succ_impl(X x) {
-            constexpr auto n = value(x);
-            return integral_constant<I, decltype(inc(n)), inc(n)>;
-        }
-
-        template <typename X>
-        static constexpr decltype(auto) pred_impl(X x) {
-            constexpr auto n = value(x);
-            return integral_constant<I, decltype(dec(n)), dec(n)>;
-        }
-    };
-
-    //! Instance of `Enumerable` for `IntegralConstant`s.
-    //!
-    //! This instance of `Enumerable` reflects the usual definition of
-    //! `succ` and `pred` for natural numbers. Specifically, `succ(n)`
-    //! is an `IntegralConstant` holding `++value(n)`, and `pred(n)` is
-    //! an `IntegralConstant` holding `--value(n)`.
-    //!
-    //! ### Example
-    //! @snippet example/integral_constant.cpp enumerable
-    template <typename I>
-    struct Enumerable::instance<I, when<is_an<IntegralConstant, I>()>>
-        : Enumerable::integral_constant_mcd<I>
-    { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_ENUMERABLE_INTEGRAL_CONSTANT_MCD_HPP
diff --git a/include/boost/hana/enumerable/mcd.hpp b/include/boost/hana/enumerable/mcd.hpp
deleted file mode 100644
index a0846c685..000000000
--- a/include/boost/hana/enumerable/mcd.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Enumerable::mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_ENUMERABLE_MCD_HPP
-#define BOOST_HANA_ENUMERABLE_MCD_HPP
-
-#include <boost/hana/enumerable/enumerable.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition : `succ` and `pred`
-    struct Enumerable::mcd { };
-}}
-
-#endif // !BOOST_HANA_ENUMERABLE_MCD_HPP
diff --git a/include/boost/hana/ext/boost/fusion/sequence.hpp b/include/boost/hana/ext/boost/fusion/sequence.hpp
index 4ab76932c..1d247ce42 100644
--- a/include/boost/hana/ext/boost/fusion/sequence.hpp
+++ b/include/boost/hana/ext/boost/fusion/sequence.hpp
@@ -1,6 +1,6 @@
 /*!
 @file
-Defines `boost::hana::BoostFusionSequence`.
+Defines `boost::hana::ext::boost::fusion::sequence`.
 
 @copyright Louis Dionne 2014
 Distributed under the Boost Software License, Version 1.0.
@@ -10,19 +10,58 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_HPP
 #define BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_HPP
 
-#include <boost/hana/ext/boost/fusion/sequence/sequence.hpp>
+#include <boost/hana/fwd/ext/boost/fusion/sequence.hpp>
 
-// Instances
-#include <boost/hana/ext/boost/fusion/sequence/comparable.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/detail/std/forward.hpp>
 
-#include <boost/hana/ext/boost/fusion/sequence/functor.hpp>
-#include <boost/hana/ext/boost/fusion/sequence/applicative.hpp>
-#include <boost/hana/ext/boost/fusion/sequence/monad.hpp>
-#include <boost/hana/ext/boost/fusion/sequence/traversable.hpp>
+// instances
+#include <boost/hana/iterable.hpp>
+#include <boost/hana/list.hpp>
 
-#include <boost/hana/ext/boost/fusion/sequence/foldable.hpp>
-#include <boost/hana/ext/boost/fusion/sequence/iterable.hpp>
-#include <boost/hana/ext/boost/fusion/sequence/list.hpp>
-#include <boost/hana/ext/boost/fusion/sequence/searchable.hpp>
+#include <boost/fusion/algorithm/transformation/pop_front.hpp>
+#include <boost/fusion/algorithm/transformation/push_front.hpp>
+#include <boost/fusion/container/list/cons.hpp>
+#include <boost/fusion/sequence/intrinsic/empty.hpp>
+#include <boost/fusion/sequence/intrinsic/front.hpp>
+
+
+namespace boost { namespace hana {
+    template <>
+    struct Iterable::instance<ext::boost::fusion::sequence>
+        : Iterable::mcd
+    {
+        template <typename Xs>
+        static constexpr auto is_empty_impl(Xs&& xs) {
+            using R = decltype(::boost::fusion::empty(detail::std::forward<Xs>(xs)));
+            return bool_<R::value>;
+        }
+
+        template <typename Xs>
+        static constexpr decltype(auto) head_impl(Xs&& xs) {
+            return ::boost::fusion::front(detail::std::forward<Xs>(xs));
+        }
+
+        template <typename Xs>
+        static constexpr decltype(auto) tail_impl(Xs&& xs) {
+            return ::boost::fusion::pop_front(detail::std::forward<Xs>(xs));
+        }
+    };
+
+    template <>
+    struct List::instance<ext::boost::fusion::sequence>
+        : List::mcd<ext::boost::fusion::sequence>
+    {
+        template <typename X, typename Xs>
+        static constexpr decltype(auto) cons_impl(X&& x, Xs&& xs) {
+            return ::boost::fusion::push_front(
+                    detail::std::forward<Xs>(xs),
+                    detail::std::forward<X>(x));
+        }
+
+        static auto nil_impl()
+        { return ::boost::fusion::nil{}; }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_HPP
diff --git a/include/boost/hana/ext/boost/fusion/sequence/applicative.hpp b/include/boost/hana/ext/boost/fusion/sequence/applicative.hpp
deleted file mode 100644
index f757a972d..000000000
--- a/include/boost/hana/ext/boost/fusion/sequence/applicative.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Applicative` for `boost::hana::BoostFusionSequence`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_APPLICATIVE_HPP
-#define BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_APPLICATIVE_HPP
-
-#include <boost/hana/ext/boost/fusion/sequence/functor.hpp>
-#include <boost/hana/ext/boost/fusion/sequence/list.hpp>
-#include <boost/hana/applicative/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_APPLICATIVE_HPP
diff --git a/include/boost/hana/ext/boost/fusion/sequence/comparable.hpp b/include/boost/hana/ext/boost/fusion/sequence/comparable.hpp
deleted file mode 100644
index e72e02c7c..000000000
--- a/include/boost/hana/ext/boost/fusion/sequence/comparable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Comparable` for `boost::hana::BoostFusionSequence`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_COMPARABLE_HPP
-#define BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_COMPARABLE_HPP
-
-#include <boost/hana/ext/boost/fusion/sequence/list.hpp>
-#include <boost/hana/comparable/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_COMPARABLE_HPP
diff --git a/include/boost/hana/ext/boost/fusion/sequence/foldable.hpp b/include/boost/hana/ext/boost/fusion/sequence/foldable.hpp
deleted file mode 100644
index c9ed8be5b..000000000
--- a/include/boost/hana/ext/boost/fusion/sequence/foldable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Foldable` for `boost::hana::BoostFusionSequence`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_FOLDABLE_HPP
-#define BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_FOLDABLE_HPP
-
-#include <boost/hana/ext/boost/fusion/sequence/iterable.hpp>
-#include <boost/hana/foldable/iterable_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_FOLDABLE_HPP
diff --git a/include/boost/hana/ext/boost/fusion/sequence/functor.hpp b/include/boost/hana/ext/boost/fusion/sequence/functor.hpp
deleted file mode 100644
index bd7fed1a7..000000000
--- a/include/boost/hana/ext/boost/fusion/sequence/functor.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Functor` for `boost::hana::BoostFusionSequence`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_FUNCTOR_HPP
-#define BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_FUNCTOR_HPP
-
-#include <boost/hana/ext/boost/fusion/sequence/list.hpp>
-#include <boost/hana/functor/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_FUNCTOR_HPP
diff --git a/include/boost/hana/ext/boost/fusion/sequence/iterable.hpp b/include/boost/hana/ext/boost/fusion/sequence/iterable.hpp
deleted file mode 100644
index 5c7ffeb68..000000000
--- a/include/boost/hana/ext/boost/fusion/sequence/iterable.hpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Iterable` for `boost::hana::BoostFusionSequence`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_ITERABLE_HPP
-#define BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_ITERABLE_HPP
-
-#include <boost/hana/bool.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/ext/boost/fusion/sequence/sequence.hpp>
-#include <boost/hana/iterable/mcd.hpp>
-
-#include <boost/fusion/algorithm/transformation/pop_front.hpp>
-#include <boost/fusion/sequence/intrinsic/empty.hpp>
-#include <boost/fusion/sequence/intrinsic/front.hpp>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct Iterable::instance<BoostFusionSequence>
-        : Iterable::mcd
-    {
-        template <typename Xs>
-        static constexpr auto is_empty_impl(Xs&& xs) {
-            using R = decltype(boost::fusion::empty(detail::std::forward<Xs>(xs)));
-            return bool_<R::value>;
-        }
-
-        template <typename Xs>
-        static constexpr decltype(auto) head_impl(Xs&& xs) {
-            return boost::fusion::front(detail::std::forward<Xs>(xs));
-        }
-
-        template <typename Xs>
-        static constexpr decltype(auto) tail_impl(Xs&& xs) {
-            return boost::fusion::pop_front(detail::std::forward<Xs>(xs));
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_ITERABLE_HPP
diff --git a/include/boost/hana/ext/boost/fusion/sequence/list.hpp b/include/boost/hana/ext/boost/fusion/sequence/list.hpp
deleted file mode 100644
index a8b38abeb..000000000
--- a/include/boost/hana/ext/boost/fusion/sequence/list.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::List` for `boost::hana::BoostFusionSequence`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_LIST_HPP
-#define BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_LIST_HPP
-
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/ext/boost/fusion/sequence/sequence.hpp>
-#include <boost/hana/list/mcd.hpp>
-
-// Mcd
-#include <boost/hana/ext/boost/fusion/sequence/monad.hpp>
-#include <boost/hana/ext/boost/fusion/sequence/foldable.hpp>
-#include <boost/hana/ext/boost/fusion/sequence/iterable.hpp>
-
-#include <boost/fusion/algorithm/transformation/push_front.hpp>
-#include <boost/fusion/container/list/cons.hpp>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct List::instance<BoostFusionSequence>
-        : List::mcd<BoostFusionSequence>
-    {
-        template <typename X, typename Xs>
-        static constexpr decltype(auto) cons_impl(X&& x, Xs&& xs) {
-            return boost::fusion::push_front(
-                    detail::std::forward<Xs>(xs),
-                    detail::std::forward<X>(x));
-        }
-
-        static auto nil_impl()
-        { return boost::fusion::nil{}; }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_LIST_HPP
diff --git a/include/boost/hana/ext/boost/fusion/sequence/monad.hpp b/include/boost/hana/ext/boost/fusion/sequence/monad.hpp
deleted file mode 100644
index 1c3ee3477..000000000
--- a/include/boost/hana/ext/boost/fusion/sequence/monad.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Monad` for `boost::hana::BoostFusionSequence`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_MONAD_HPP
-#define BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_MONAD_HPP
-
-#include <boost/hana/ext/boost/fusion/sequence/applicative.hpp>
-#include <boost/hana/ext/boost/fusion/sequence/list.hpp>
-#include <boost/hana/monad/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_MONAD_HPP
diff --git a/include/boost/hana/ext/boost/fusion/sequence/searchable.hpp b/include/boost/hana/ext/boost/fusion/sequence/searchable.hpp
deleted file mode 100644
index 4cc00751b..000000000
--- a/include/boost/hana/ext/boost/fusion/sequence/searchable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Searchable` for `boost::hana::BoostFusionSequence`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_SEARCHABLE_HPP
-#define BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_SEARCHABLE_HPP
-
-#include <boost/hana/ext/boost/fusion/sequence/list.hpp>
-#include <boost/hana/searchable/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_SEARCHABLE_HPP
diff --git a/include/boost/hana/ext/boost/fusion/sequence/traversable.hpp b/include/boost/hana/ext/boost/fusion/sequence/traversable.hpp
deleted file mode 100644
index 31ea54fa8..000000000
--- a/include/boost/hana/ext/boost/fusion/sequence/traversable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Traversable` for `boost::hana::BoostFusionSequence`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_TRAVERSABLE_HPP
-#define BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_TRAVERSABLE_HPP
-
-#include <boost/hana/ext/boost/fusion/sequence/list.hpp>
-#include <boost/hana/traversable/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_TRAVERSABLE_HPP
diff --git a/include/boost/hana/ext/boost/mpl/integral_c.hpp b/include/boost/hana/ext/boost/mpl/integral_c.hpp
index 9904db4a3..ea0f96857 100644
--- a/include/boost/hana/ext/boost/mpl/integral_c.hpp
+++ b/include/boost/hana/ext/boost/mpl/integral_c.hpp
@@ -1,6 +1,6 @@
 /*!
 @file
-Defines `boost::hana::BoostMplIntegralConstant`.
+Defines `boost::hana::ext::boost::mpl::IntegralC`.
 
 @copyright Louis Dionne 2014
 Distributed under the Boost Software License, Version 1.0.
@@ -10,20 +10,35 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_HPP
 #define BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_HPP
 
-#include <boost/hana/ext/boost/mpl/integral_c/integral_c.hpp>
+#include <boost/hana/fwd/ext/boost/mpl/integral_c.hpp>
 
-// Instances
-#include <boost/hana/ext/boost/mpl/integral_c/constant.hpp>
-#include <boost/hana/ext/boost/mpl/integral_c/integral_constant.hpp>
+// instances
+#include <boost/hana/constant.hpp>
+#include <boost/hana/integral_constant.hpp>
 
-#include <boost/hana/ext/boost/mpl/integral_c/comparable.hpp>
-#include <boost/hana/ext/boost/mpl/integral_c/orderable.hpp>
-#include <boost/hana/ext/boost/mpl/integral_c/logical.hpp>
-#include <boost/hana/ext/boost/mpl/integral_c/enumerable.hpp>
+#include <boost/mpl/integral_c.hpp>
 
-#include <boost/hana/ext/boost/mpl/integral_c/monoid.hpp>
-#include <boost/hana/ext/boost/mpl/integral_c/group.hpp>
-#include <boost/hana/ext/boost/mpl/integral_c/ring.hpp>
-#include <boost/hana/ext/boost/mpl/integral_c/integral_domain.hpp>
+
+namespace boost { namespace hana {
+    //! `Constant` instance for Boost.MPL IntegralConstants.
+    //!
+    //! ### Example
+    //! @include example/ext/boost/mpl/integral_c/constant.cpp
+    template <>
+    struct Constant::instance<ext::boost::mpl::IntegralC> : Constant::mcd {
+        template <typename C>
+        static constexpr auto value_impl(C const&)
+        { return C::value; }
+    };
+
+    template <>
+    struct IntegralConstant::instance<ext::boost::mpl::IntegralC>
+        : IntegralConstant::mcd
+    {
+        template <typename T, T v>
+        static constexpr auto integral_constant_impl()
+        { return ::boost::mpl::integral_c<T, v>{}; }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_HPP
diff --git a/include/boost/hana/ext/boost/mpl/integral_c/comparable.hpp b/include/boost/hana/ext/boost/mpl/integral_c/comparable.hpp
deleted file mode 100644
index bb2a1000c..000000000
--- a/include/boost/hana/ext/boost/mpl/integral_c/comparable.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Comparable` for
-`boost::hana::BoostMplIntegralConstant`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_COMPARABLE_HPP
-#define BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_COMPARABLE_HPP
-
-#include <boost/hana/ext/boost/mpl/integral_c/integral_constant.hpp>
-#include <boost/hana/comparable/integral_constant_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_COMPARABLE_HPP
diff --git a/include/boost/hana/ext/boost/mpl/integral_c/constant.hpp b/include/boost/hana/ext/boost/mpl/integral_c/constant.hpp
deleted file mode 100644
index c4dbcc157..000000000
--- a/include/boost/hana/ext/boost/mpl/integral_c/constant.hpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Constant` for
-`boost::hana::BoostMplIntegralConstant`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_CONSTANT_HPP
-#define BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_CONSTANT_HPP
-
-#include <boost/hana/constant/mcd.hpp>
-#include <boost/hana/ext/boost/mpl/integral_c/integral_c.hpp>
-
-
-namespace boost { namespace hana {
-    //! `Constant` instance for Boost.MPL IntegralConstants.
-    //!
-    //! ### Example
-    //! @include example/ext/boost/mpl/integral_c/constant.cpp
-    template <>
-    struct Constant::instance<BoostMplIntegralConstant> : Constant::mcd {
-        template <typename C>
-        static constexpr auto value_impl(C const&)
-        { return C::value; }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_CONSTANT_HPP
diff --git a/include/boost/hana/ext/boost/mpl/integral_c/enumerable.hpp b/include/boost/hana/ext/boost/mpl/integral_c/enumerable.hpp
deleted file mode 100644
index c9b9cf938..000000000
--- a/include/boost/hana/ext/boost/mpl/integral_c/enumerable.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Enumerable` for
-`boost::hana::BoostMplIntegralConstant`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_ENUMERABLE_HPP
-#define BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_ENUMERABLE_HPP
-
-#include <boost/hana/ext/boost/mpl/integral_c/integral_constant.hpp>
-#include <boost/hana/enumerable/integral_constant_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_ENUMERABLE_HPP
diff --git a/include/boost/hana/ext/boost/mpl/integral_c/group.hpp b/include/boost/hana/ext/boost/mpl/integral_c/group.hpp
deleted file mode 100644
index 39f1efdb1..000000000
--- a/include/boost/hana/ext/boost/mpl/integral_c/group.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Group` for
-`boost::hana::BoostMplIntegralConstant`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_GROUP_HPP
-#define BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_GROUP_HPP
-
-#include <boost/hana/ext/boost/mpl/integral_c/integral_constant.hpp>
-#include <boost/hana/group/integral_constant_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_GROUP_HPP
diff --git a/include/boost/hana/ext/boost/mpl/integral_c/integral_c.hpp b/include/boost/hana/ext/boost/mpl/integral_c/integral_c.hpp
deleted file mode 100644
index ea5dce573..000000000
--- a/include/boost/hana/ext/boost/mpl/integral_c/integral_c.hpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*!
-@file
-Forward declares `boost::hana::BoostMplIntegralConstant`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_INTEGRAL_C_HPP
-#define BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_INTEGRAL_C_HPP
-
-#include <boost/hana/core/datatype.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/detail/std/is_same.hpp>
-
-#include <boost/mpl/integral_c_tag.hpp>
-
-
-namespace boost { namespace hana {
-    //! @ingroup group-datatypes
-    //! Data type representing Boost.MPL IntegralConstants
-    //!
-    //! ### Instance of
-    //! `Constant`
-    struct BoostMplIntegralConstant;
-
-    template <typename T>
-    struct datatype<T, when<
-        detail::std::is_same<
-            typename T::tag,
-            boost::mpl::integral_c_tag
-        >::value
-    >> {
-        using type = BoostMplIntegralConstant;
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_INTEGRAL_C_HPP
diff --git a/include/boost/hana/ext/boost/mpl/integral_c/integral_constant.hpp b/include/boost/hana/ext/boost/mpl/integral_c/integral_constant.hpp
deleted file mode 100644
index 79cb64a49..000000000
--- a/include/boost/hana/ext/boost/mpl/integral_c/integral_constant.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::IntegralConstant` for
-`boost::hana::BoostMplIntegralConstant`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_INTEGRAL_CONSTANT_HPP
-#define BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_INTEGRAL_CONSTANT_HPP
-
-#include <boost/hana/ext/boost/mpl/integral_c/integral_c.hpp>
-#include <boost/hana/integral_constant/mcd.hpp>
-
-// Mcd
-#include <boost/hana/ext/boost/mpl/integral_c/constant.hpp>
-
-#include <boost/mpl/integral_c.hpp>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct IntegralConstant::instance<BoostMplIntegralConstant>
-        : IntegralConstant::mcd
-    {
-        template <typename T, T v>
-        static constexpr auto integral_constant_impl()
-        { return boost::mpl::integral_c<T, v>{}; }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_INTEGRAL_CONSTANT_HPP
diff --git a/include/boost/hana/ext/boost/mpl/integral_c/integral_domain.hpp b/include/boost/hana/ext/boost/mpl/integral_c/integral_domain.hpp
deleted file mode 100644
index f46446081..000000000
--- a/include/boost/hana/ext/boost/mpl/integral_c/integral_domain.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::IntegralDomain` for
-`boost::hana::BoostMplIntegralConstant`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_INTEGRAL_DOMAIN_HPP
-#define BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_INTEGRAL_DOMAIN_HPP
-
-#include <boost/hana/ext/boost/mpl/integral_c/integral_constant.hpp>
-#include <boost/hana/integral_domain/integral_constant_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_INTEGRAL_DOMAIN_HPP
diff --git a/include/boost/hana/ext/boost/mpl/integral_c/logical.hpp b/include/boost/hana/ext/boost/mpl/integral_c/logical.hpp
deleted file mode 100644
index 1fa4e20ce..000000000
--- a/include/boost/hana/ext/boost/mpl/integral_c/logical.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Logical` for
-`boost::hana::BoostMplIntegralConstant`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_LOGICAL_HPP
-#define BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_LOGICAL_HPP
-
-#include <boost/hana/ext/boost/mpl/integral_c/integral_constant.hpp>
-#include <boost/hana/logical/integral_constant_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_LOGICAL_HPP
diff --git a/include/boost/hana/ext/boost/mpl/integral_c/monoid.hpp b/include/boost/hana/ext/boost/mpl/integral_c/monoid.hpp
deleted file mode 100644
index 8c0c7614e..000000000
--- a/include/boost/hana/ext/boost/mpl/integral_c/monoid.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Monoid` for
-`boost::hana::BoostMplIntegralConstant`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_MONOID_HPP
-#define BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_MONOID_HPP
-
-#include <boost/hana/ext/boost/mpl/integral_c/integral_constant.hpp>
-#include <boost/hana/monoid/integral_constant_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_MONOID_HPP
diff --git a/include/boost/hana/ext/boost/mpl/integral_c/orderable.hpp b/include/boost/hana/ext/boost/mpl/integral_c/orderable.hpp
deleted file mode 100644
index 01d24d559..000000000
--- a/include/boost/hana/ext/boost/mpl/integral_c/orderable.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Orderable` for
-`boost::hana::BoostMplIntegralConstant`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_ORDERABLE_HPP
-#define BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_ORDERABLE_HPP
-
-#include <boost/hana/ext/boost/mpl/integral_c/integral_constant.hpp>
-#include <boost/hana/orderable/integral_constant_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_ORDERABLE_HPP
diff --git a/include/boost/hana/ext/boost/mpl/integral_c/ring.hpp b/include/boost/hana/ext/boost/mpl/integral_c/ring.hpp
deleted file mode 100644
index c9713cc00..000000000
--- a/include/boost/hana/ext/boost/mpl/integral_c/ring.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Ring` for
-`boost::hana::BoostMplIntegralConstant`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_RING_HPP
-#define BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_RING_HPP
-
-#include <boost/hana/ext/boost/mpl/integral_c/integral_constant.hpp>
-#include <boost/hana/ring/integral_constant_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_MPL_INTEGRAL_C_RING_HPP
diff --git a/include/boost/hana/ext/boost/mpl/vector.hpp b/include/boost/hana/ext/boost/mpl/vector.hpp
index 67a08cca5..186f9b75e 100644
--- a/include/boost/hana/ext/boost/mpl/vector.hpp
+++ b/include/boost/hana/ext/boost/mpl/vector.hpp
@@ -1,6 +1,6 @@
 /*!
 @file
-Defines `boost::hana::BoostMplVector`.
+Defines `boost::hana::ext::boost::mpl::Vector`.
 
 @copyright Louis Dionne 2014
 Distributed under the Boost Software License, Version 1.0.
@@ -10,19 +10,68 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_EXT_BOOST_MPL_VECTOR_HPP
 #define BOOST_HANA_EXT_BOOST_MPL_VECTOR_HPP
 
-#include <boost/hana/ext/boost/mpl/vector/vector.hpp>
+#include <boost/hana/fwd/ext/boost/mpl/vector.hpp>
 
-// Instances
-#include <boost/hana/ext/boost/mpl/vector/comparable.hpp>
+#include <boost/hana/core/datatype.hpp>
+#include <boost/hana/detail/std/is_same.hpp>
+#include <boost/hana/ext/boost/mpl/integral_c.hpp>
+#include <boost/hana/type.hpp>
 
-#include <boost/hana/ext/boost/mpl/vector/functor.hpp>
-#include <boost/hana/ext/boost/mpl/vector/applicative.hpp>
-#include <boost/hana/ext/boost/mpl/vector/monad.hpp>
-#include <boost/hana/ext/boost/mpl/vector/traversable.hpp>
+// instances
+#include <boost/hana/iterable.hpp>
+#include <boost/hana/list.hpp>
 
-#include <boost/hana/ext/boost/mpl/vector/foldable.hpp>
-#include <boost/hana/ext/boost/mpl/vector/iterable.hpp>
-#include <boost/hana/ext/boost/mpl/vector/list.hpp>
-#include <boost/hana/ext/boost/mpl/vector/searchable.hpp>
+#include <boost/mpl/empty.hpp>
+#include <boost/mpl/front.hpp>
+#include <boost/mpl/pop_front.hpp>
+#include <boost/mpl/push_front.hpp>
+#include <boost/mpl/vector/vector0.hpp>
+
+
+namespace boost { namespace hana {
+    //! `Iterable` instance for Boost.MPL vectors.
+    //!
+    //! ### Example
+    //! @include example/ext/boost/mpl/vector/iterable.cpp
+    template <>
+    struct Iterable::instance<ext::boost::mpl::Vector> : Iterable::mcd {
+        template <typename xs>
+        static constexpr auto head_impl(xs)
+        { return type<typename ::boost::mpl::front<xs>::type>; }
+
+        template <typename xs>
+        static constexpr auto tail_impl(xs)
+        { return typename ::boost::mpl::pop_front<xs>::type{}; }
+
+        template <typename xs>
+        static constexpr auto is_empty_impl(xs)
+        { return typename ::boost::mpl::empty<xs>::type{}; }
+    };
+
+    //! `List` instance for Boost.MPL vectors.
+    //!
+    //! Note that since Boost.MPL vectors can only hold types,
+    //! only `Type`s can be used with `cons`.
+    //!
+    //! ### Example
+    //! @include example/ext/boost/mpl/vector/list.cpp
+    template <>
+    struct List::instance<ext::boost::mpl::Vector>
+        : List::mcd<ext::boost::mpl::Vector>
+    {
+        template <typename x, typename xs>
+        static constexpr auto cons_impl(x, xs) {
+            static_assert(detail::std::is_same<datatype_t<x>, Type>::value,
+            "Only Types may be prepended to a Boost.MPL vector.");
+
+            return typename ::boost::mpl::push_front<
+                xs, typename x::type
+            >::type{};
+        }
+
+        static constexpr auto nil_impl()
+        { return ::boost::mpl::vector0<>{}; }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_EXT_BOOST_MPL_VECTOR_HPP
diff --git a/include/boost/hana/ext/boost/mpl/vector/applicative.hpp b/include/boost/hana/ext/boost/mpl/vector/applicative.hpp
deleted file mode 100644
index b4ca67aeb..000000000
--- a/include/boost/hana/ext/boost/mpl/vector/applicative.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Applicative` for `boost::hana::BoostMplVector`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_MPL_VECTOR_APPLICATIVE_HPP
-#define BOOST_HANA_EXT_BOOST_MPL_VECTOR_APPLICATIVE_HPP
-
-#include <boost/hana/ext/boost/mpl/vector/functor.hpp>
-#include <boost/hana/ext/boost/mpl/vector/list.hpp>
-#include <boost/hana/applicative/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_MPL_VECTOR_APPLICATIVE_HPP
diff --git a/include/boost/hana/ext/boost/mpl/vector/comparable.hpp b/include/boost/hana/ext/boost/mpl/vector/comparable.hpp
deleted file mode 100644
index c942a1e6c..000000000
--- a/include/boost/hana/ext/boost/mpl/vector/comparable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Comparable` for `boost::hana::BoostMplVector`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_MPL_VECTOR_COMPARABLE_HPP
-#define BOOST_HANA_EXT_BOOST_MPL_VECTOR_COMPARABLE_HPP
-
-#include <boost/hana/ext/boost/mpl/vector/list.hpp>
-#include <boost/hana/comparable/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_MPL_VECTOR_COMPARABLE_HPP
diff --git a/include/boost/hana/ext/boost/mpl/vector/foldable.hpp b/include/boost/hana/ext/boost/mpl/vector/foldable.hpp
deleted file mode 100644
index f575b353e..000000000
--- a/include/boost/hana/ext/boost/mpl/vector/foldable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Foldable` for `boost::hana::BoostMplVector`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_MPL_VECTOR_FOLDABLE_HPP
-#define BOOST_HANA_EXT_BOOST_MPL_VECTOR_FOLDABLE_HPP
-
-#include <boost/hana/ext/boost/mpl/vector/iterable.hpp>
-#include <boost/hana/foldable/iterable_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_MPL_VECTOR_FOLDABLE_HPP
diff --git a/include/boost/hana/ext/boost/mpl/vector/functor.hpp b/include/boost/hana/ext/boost/mpl/vector/functor.hpp
deleted file mode 100644
index 64ea24589..000000000
--- a/include/boost/hana/ext/boost/mpl/vector/functor.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Functor` for `boost::hana::BoostMplVector`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_MPL_VECTOR_FUNCTOR_HPP
-#define BOOST_HANA_EXT_BOOST_MPL_VECTOR_FUNCTOR_HPP
-
-#include <boost/hana/ext/boost/mpl/vector/list.hpp>
-#include <boost/hana/functor/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_MPL_VECTOR_FUNCTOR_HPP
diff --git a/include/boost/hana/ext/boost/mpl/vector/iterable.hpp b/include/boost/hana/ext/boost/mpl/vector/iterable.hpp
deleted file mode 100644
index b91b511b1..000000000
--- a/include/boost/hana/ext/boost/mpl/vector/iterable.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Iterable` for `boost::hana::BoostMplVector`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_MPL_VECTOR_ITERABLE_HPP
-#define BOOST_HANA_EXT_BOOST_MPL_VECTOR_ITERABLE_HPP
-
-#include <boost/hana/ext/boost/mpl/integral_c.hpp>
-#include <boost/hana/ext/boost/mpl/vector/vector.hpp>
-#include <boost/hana/iterable/mcd.hpp>
-#include <boost/hana/type.hpp>
-
-#include <boost/mpl/empty.hpp>
-#include <boost/mpl/front.hpp>
-#include <boost/mpl/pop_front.hpp>
-
-
-namespace boost { namespace hana {
-    //! `Iterable` instance for Boost.MPL vectors.
-    //!
-    //! ### Example
-    //! @include example/ext/boost/mpl/vector/iterable.cpp
-    template <>
-    struct Iterable::instance<BoostMplVector> : Iterable::mcd {
-        template <typename xs>
-        static constexpr auto head_impl(xs)
-        { return type<typename boost::mpl::front<xs>::type>; }
-
-        template <typename xs>
-        static constexpr auto tail_impl(xs)
-        { return typename boost::mpl::pop_front<xs>::type{}; }
-
-        template <typename xs>
-        static constexpr auto is_empty_impl(xs)
-        { return typename boost::mpl::empty<xs>::type{}; }
-    };
-}}
-
-#endif // !BOOST_HANA_EXT_BOOST_MPL_VECTOR_ITERABLE_HPP
diff --git a/include/boost/hana/ext/boost/mpl/vector/list.hpp b/include/boost/hana/ext/boost/mpl/vector/list.hpp
deleted file mode 100644
index fec242740..000000000
--- a/include/boost/hana/ext/boost/mpl/vector/list.hpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::List` for `boost::hana::BoostMplVector`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_MPL_VECTOR_LIST_HPP
-#define BOOST_HANA_EXT_BOOST_MPL_VECTOR_LIST_HPP
-
-#include <boost/hana/core/datatype.hpp>
-#include <boost/hana/detail/std/is_same.hpp>
-#include <boost/hana/ext/boost/mpl/vector/vector.hpp>
-#include <boost/hana/list/mcd.hpp>
-#include <boost/hana/type.hpp>
-
-#include <boost/mpl/push_front.hpp>
-#include <boost/mpl/vector/vector0.hpp>
-
-
-namespace boost { namespace hana {
-    //! `List` instance for Boost.MPL vectors.
-    //!
-    //! Note that since Boost.MPL vectors can only hold types,
-    //! only `Type`s can be used with `cons`.
-    //!
-    //! ### Example
-    //! @include example/ext/boost/mpl/vector/list.cpp
-    template <>
-    struct List::instance<BoostMplVector> : List::mcd<BoostMplVector> {
-        template <typename x, typename xs>
-        static constexpr auto cons_impl(x, xs) {
-            static_assert(detail::std::is_same<datatype_t<x>, Type>::value,
-            "Only Types may be prepended to a Boost.MPL vector.");
-
-            return typename boost::mpl::push_front<
-                xs, typename x::type
-            >::type{};
-        }
-
-        static constexpr auto nil_impl()
-        { return boost::mpl::vector0<>{}; }
-    };
-}}
-
-#endif // !BOOST_HANA_EXT_BOOST_MPL_VECTOR_LIST_HPP
diff --git a/include/boost/hana/ext/boost/mpl/vector/monad.hpp b/include/boost/hana/ext/boost/mpl/vector/monad.hpp
deleted file mode 100644
index 0fbc82a10..000000000
--- a/include/boost/hana/ext/boost/mpl/vector/monad.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Monad` for `boost::hana::BoostMplVector`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_MPL_VECTOR_MONAD_HPP
-#define BOOST_HANA_EXT_BOOST_MPL_VECTOR_MONAD_HPP
-
-#include <boost/hana/ext/boost/mpl/vector/applicative.hpp>
-#include <boost/hana/ext/boost/mpl/vector/list.hpp>
-#include <boost/hana/monad/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_MPL_VECTOR_MONAD_HPP
diff --git a/include/boost/hana/ext/boost/mpl/vector/searchable.hpp b/include/boost/hana/ext/boost/mpl/vector/searchable.hpp
deleted file mode 100644
index 81711334d..000000000
--- a/include/boost/hana/ext/boost/mpl/vector/searchable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Searchable` for `boost::hana::BoostMplVector`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_MPL_VECTOR_SEARCHABLE_HPP
-#define BOOST_HANA_EXT_BOOST_MPL_VECTOR_SEARCHABLE_HPP
-
-#include <boost/hana/ext/boost/mpl/vector/list.hpp>
-#include <boost/hana/searchable/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_MPL_VECTOR_SEARCHABLE_HPP
diff --git a/include/boost/hana/ext/boost/mpl/vector/traversable.hpp b/include/boost/hana/ext/boost/mpl/vector/traversable.hpp
deleted file mode 100644
index bedbea46a..000000000
--- a/include/boost/hana/ext/boost/mpl/vector/traversable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Traversable` for `boost::hana::BoostMplVector`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_MPL_VECTOR_TRAVERSABLE_HPP
-#define BOOST_HANA_EXT_BOOST_MPL_VECTOR_TRAVERSABLE_HPP
-
-#include <boost/hana/ext/boost/mpl/vector/list.hpp>
-#include <boost/hana/traversable/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_MPL_VECTOR_TRAVERSABLE_HPP
diff --git a/include/boost/hana/ext/boost/mpl/vector/vector.hpp b/include/boost/hana/ext/boost/mpl/vector/vector.hpp
deleted file mode 100644
index 6ee20960f..000000000
--- a/include/boost/hana/ext/boost/mpl/vector/vector.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*!
-@file
-Forward declares `boost::hana::BoostMplVector`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_MPL_VECTOR_VECTOR_HPP
-#define BOOST_HANA_EXT_BOOST_MPL_VECTOR_VECTOR_HPP
-
-#include <boost/hana/core/datatype.hpp>
-#include <boost/hana/detail/std/is_same.hpp>
-
-#include <boost/mpl/sequence_tag.hpp>
-#include <boost/mpl/vector.hpp>
-
-
-namespace boost { namespace hana {
-    //! @ingroup group-datatypes
-    //! Data type representing Boost.MPL vectors.
-    //!
-    //! ## Instance of
-    //! `Functor`, `Iterable`, `List` and `Comparable`
-    //!
-    //! ## MPL / Hana cheat sheet
-    //! This section presents correspondences between operations with the
-    //! Boost.MPL and operations with Boost.Hana. The organization follows
-    //! that of the Boost.MPL algorithms.
-    //!
-    //! ### Iteration algorithms
-    //! #### `fold`
-    //! @snippet example/ext/boost/mpl/vector/cheatsheet/fold.cpp mpl
-    //! @snippet example/ext/boost/mpl/vector/cheatsheet/fold.cpp hana
-    //!
-    //! @todo
-    //! - Finish the cheat sheet.
-    //! - Remove the tuple.hpp include.
-    //! - Fix documentation of instances.
-#ifdef BOOST_HANA_DOXYGEN_INVOKED
-    struct BoostMplVector { };
-#else
-    using BoostMplVector = boost::mpl::sequence_tag<boost::mpl::vector<>>::type;
-#endif
-
-    template <typename T>
-    struct datatype<T, when<
-        detail::std::is_same<
-            typename boost::mpl::sequence_tag<T>::type,
-            BoostMplVector
-        >::value
-    >> {
-        using type = BoostMplVector;
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_BOOST_MPL_VECTOR_VECTOR_HPP
diff --git a/include/boost/hana/ext/boost/tuple.hpp b/include/boost/hana/ext/boost/tuple.hpp
index 13fa689d9..6bc911607 100644
--- a/include/boost/hana/ext/boost/tuple.hpp
+++ b/include/boost/hana/ext/boost/tuple.hpp
@@ -1,6 +1,6 @@
 /*!
 @file
-Defines `boost::hana::BoostTuple`.
+Defines `boost::hana::ext::boost::tuple`.
 
 @copyright Louis Dionne 2014
 Distributed under the Boost Software License, Version 1.0.
@@ -10,19 +10,51 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_EXT_BOOST_TUPLE_HPP
 #define BOOST_HANA_EXT_BOOST_TUPLE_HPP
 
-#include <boost/hana/ext/boost/tuple/tuple.hpp>
+#include <boost/hana/fwd/ext/boost/tuple.hpp>
 
-// Instances
-#include <boost/hana/ext/boost/tuple/comparable.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+#include <boost/hana/detail/std/move.hpp>
 
-#include <boost/hana/ext/boost/tuple/functor.hpp>
-#include <boost/hana/ext/boost/tuple/applicative.hpp>
-#include <boost/hana/ext/boost/tuple/monad.hpp>
-#include <boost/hana/ext/boost/tuple/traversable.hpp>
+// instances
+#include <boost/hana/iterable.hpp>
+#include <boost/hana/list.hpp>
 
-#include <boost/hana/ext/boost/tuple/foldable.hpp>
-#include <boost/hana/ext/boost/tuple/iterable.hpp>
-#include <boost/hana/ext/boost/tuple/list.hpp>
-#include <boost/hana/ext/boost/tuple/searchable.hpp>
+#include <boost/tuple/tuple.hpp>
+
+
+namespace boost { namespace hana {
+    template <>
+    struct Iterable::instance<ext::boost::tuple> : Iterable::mcd {
+        template <typename Xs>
+        static constexpr decltype(auto) head_impl(Xs&& tuple)
+        { return detail::std::forward<Xs>(tuple).get_head(); }
+
+        template <typename Xs>
+        static constexpr decltype(auto) tail_impl(Xs&& tuple)
+        { return detail::std::forward<Xs>(tuple).get_tail(); }
+
+        static constexpr auto is_empty_impl(::boost::tuples::null_type const&)
+        { return true_; }
+
+        template <typename H, typename T>
+        static constexpr auto is_empty_impl(::boost::tuples::cons<H, T> const&)
+        { return false_; }
+    };
+
+    template <>
+    struct List::instance<ext::boost::tuple> : List::mcd<ext::boost::tuple> {
+        template <typename X, typename Xs>
+        static constexpr auto cons_impl(X x, Xs xs) {
+            return ::boost::tuples::cons<X, Xs>{
+                detail::std::move(x),
+                detail::std::move(xs)
+            };
+        }
+
+        static constexpr auto nil_impl()
+        { return ::boost::tuples::null_type{}; }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_EXT_BOOST_TUPLE_HPP
diff --git a/include/boost/hana/ext/boost/tuple/applicative.hpp b/include/boost/hana/ext/boost/tuple/applicative.hpp
deleted file mode 100644
index db818be49..000000000
--- a/include/boost/hana/ext/boost/tuple/applicative.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Applicative` for `boost::hana::BoostTuple`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_TUPLE_APPLICATIVE_HPP
-#define BOOST_HANA_EXT_BOOST_TUPLE_APPLICATIVE_HPP
-
-#include <boost/hana/ext/boost/tuple/functor.hpp>
-#include <boost/hana/ext/boost/tuple/list.hpp>
-#include <boost/hana/applicative/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_TUPLE_APPLICATIVE_HPP
diff --git a/include/boost/hana/ext/boost/tuple/comparable.hpp b/include/boost/hana/ext/boost/tuple/comparable.hpp
deleted file mode 100644
index b82865213..000000000
--- a/include/boost/hana/ext/boost/tuple/comparable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Comparable` for `boost::hana::BoostTuple`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_TUPLE_COMPARABLE_HPP
-#define BOOST_HANA_EXT_BOOST_TUPLE_COMPARABLE_HPP
-
-#include <boost/hana/ext/boost/tuple/list.hpp>
-#include <boost/hana/comparable/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_TUPLE_COMPARABLE_HPP
diff --git a/include/boost/hana/ext/boost/tuple/foldable.hpp b/include/boost/hana/ext/boost/tuple/foldable.hpp
deleted file mode 100644
index 2b77553bf..000000000
--- a/include/boost/hana/ext/boost/tuple/foldable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Foldable` for `boost::hana::BoostTuple`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_TUPLE_FOLDABLE_HPP
-#define BOOST_HANA_EXT_BOOST_TUPLE_FOLDABLE_HPP
-
-#include <boost/hana/ext/boost/tuple/iterable.hpp>
-#include <boost/hana/foldable/iterable_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_TUPLE_FOLDABLE_HPP
diff --git a/include/boost/hana/ext/boost/tuple/functor.hpp b/include/boost/hana/ext/boost/tuple/functor.hpp
deleted file mode 100644
index 24bfd696a..000000000
--- a/include/boost/hana/ext/boost/tuple/functor.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Functor` for `boost::hana::BoostTuple`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_TUPLE_FUNCTOR_HPP
-#define BOOST_HANA_EXT_BOOST_TUPLE_FUNCTOR_HPP
-
-#include <boost/hana/ext/boost/tuple/list.hpp>
-#include <boost/hana/functor/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_TUPLE_FUNCTOR_HPP
diff --git a/include/boost/hana/ext/boost/tuple/iterable.hpp b/include/boost/hana/ext/boost/tuple/iterable.hpp
deleted file mode 100644
index 86f1b88ca..000000000
--- a/include/boost/hana/ext/boost/tuple/iterable.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Iterable` for `boost::hana::BoostTuple`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_TUPLE_ITERABLE_HPP
-#define BOOST_HANA_EXT_BOOST_TUPLE_ITERABLE_HPP
-
-#include <boost/hana/bool.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/ext/boost/tuple/tuple.hpp>
-#include <boost/hana/iterable/mcd.hpp>
-
-#include <boost/tuple/tuple.hpp>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct Iterable::instance<BoostTuple> : Iterable::mcd {
-        template <typename Xs>
-        static constexpr decltype(auto) head_impl(Xs&& tuple)
-        { return detail::std::forward<Xs>(tuple).get_head(); }
-
-        template <typename Xs>
-        static constexpr decltype(auto) tail_impl(Xs&& tuple)
-        { return detail::std::forward<Xs>(tuple).get_tail(); }
-
-        static constexpr auto is_empty_impl(boost::tuples::null_type const&)
-        { return true_; }
-
-        template <typename H, typename T>
-        static constexpr auto is_empty_impl(boost::tuples::cons<H, T> const&)
-        { return false_; }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_BOOST_TUPLE_ITERABLE_HPP
diff --git a/include/boost/hana/ext/boost/tuple/list.hpp b/include/boost/hana/ext/boost/tuple/list.hpp
deleted file mode 100644
index 9f8c5eb09..000000000
--- a/include/boost/hana/ext/boost/tuple/list.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::List` for `boost::hana::BoostTuple`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_TUPLE_LIST_HPP
-#define BOOST_HANA_EXT_BOOST_TUPLE_LIST_HPP
-
-#include <boost/hana/detail/std/move.hpp>
-#include <boost/hana/ext/boost/tuple/tuple.hpp>
-#include <boost/hana/list/mcd.hpp>
-
-// Mcd
-#include <boost/hana/ext/boost/tuple/monad.hpp>
-#include <boost/hana/ext/boost/tuple/foldable.hpp>
-#include <boost/hana/ext/boost/tuple/iterable.hpp>
-
-#include <boost/tuple/tuple.hpp>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct List::instance<BoostTuple> : List::mcd<BoostTuple> {
-        template <typename X, typename Xs>
-        static constexpr auto cons_impl(X x, Xs xs) {
-            return boost::tuples::cons<X, Xs>{
-                detail::std::move(x),
-                detail::std::move(xs)
-            };
-        }
-
-        static constexpr auto nil_impl()
-        { return boost::tuples::null_type{}; }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_BOOST_TUPLE_LIST_HPP
diff --git a/include/boost/hana/ext/boost/tuple/monad.hpp b/include/boost/hana/ext/boost/tuple/monad.hpp
deleted file mode 100644
index bbca1117c..000000000
--- a/include/boost/hana/ext/boost/tuple/monad.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Monad` for `boost::hana::BoostTuple`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_TUPLE_MONAD_HPP
-#define BOOST_HANA_EXT_BOOST_TUPLE_MONAD_HPP
-
-#include <boost/hana/ext/boost/tuple/applicative.hpp>
-#include <boost/hana/ext/boost/tuple/list.hpp>
-#include <boost/hana/monad/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_TUPLE_MONAD_HPP
diff --git a/include/boost/hana/ext/boost/tuple/searchable.hpp b/include/boost/hana/ext/boost/tuple/searchable.hpp
deleted file mode 100644
index cd8f2d9b3..000000000
--- a/include/boost/hana/ext/boost/tuple/searchable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Searchable` for `boost::hana::BoostTuple`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_TUPLE_SEARCHABLE_HPP
-#define BOOST_HANA_EXT_BOOST_TUPLE_SEARCHABLE_HPP
-
-#include <boost/hana/ext/boost/tuple/list.hpp>
-#include <boost/hana/searchable/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_TUPLE_SEARCHABLE_HPP
diff --git a/include/boost/hana/ext/boost/tuple/traversable.hpp b/include/boost/hana/ext/boost/tuple/traversable.hpp
deleted file mode 100644
index 23b527836..000000000
--- a/include/boost/hana/ext/boost/tuple/traversable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Applicative` for `boost::hana::BoostTuple`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_TUPLE_TRAVERSABLE_HPP
-#define BOOST_HANA_EXT_BOOST_TUPLE_TRAVERSABLE_HPP
-
-#include <boost/hana/ext/boost/tuple/list.hpp>
-#include <boost/hana/traversable/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_BOOST_TUPLE_TRAVERSABLE_HPP
diff --git a/include/boost/hana/ext/boost/tuple/tuple.hpp b/include/boost/hana/ext/boost/tuple/tuple.hpp
deleted file mode 100644
index 8e4cd9e30..000000000
--- a/include/boost/hana/ext/boost/tuple/tuple.hpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*!
-@file
-Forward declares `boost::hana::BoostTuple`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_BOOST_TUPLE_TUPLE_HPP
-#define BOOST_HANA_EXT_BOOST_TUPLE_TUPLE_HPP
-
-#include <boost/hana/core/datatype.hpp>
-
-#include <boost/tuple/tuple.hpp>
-
-
-namespace boost { namespace hana {
-    struct BoostTuple;
-
-    template <typename ...Xs>
-    struct datatype<boost::tuple<Xs...>> {
-        using type = BoostTuple;
-    };
-
-    template <typename H, typename T>
-    struct datatype<boost::tuples::cons<H, T>> {
-        using type = BoostTuple;
-    };
-
-    template <>
-    struct datatype<boost::tuples::null_type> {
-        using type = BoostTuple;
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_BOOST_TUPLE_TUPLE_HPP
diff --git a/include/boost/hana/ext/std/array.hpp b/include/boost/hana/ext/std/array.hpp
index 0e1018314..f27e7d96e 100644
--- a/include/boost/hana/ext/std/array.hpp
+++ b/include/boost/hana/ext/std/array.hpp
@@ -1,6 +1,6 @@
 /*!
 @file
-Defines `boost::hana::StdArray`.
+Defines `boost::hana::ext::std::Array`.
 
 @copyright Louis Dionne 2014
 Distributed under the Boost Software License, Version 1.0.
@@ -10,19 +10,84 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_EXT_STD_ARRAY_HPP
 #define BOOST_HANA_EXT_STD_ARRAY_HPP
 
-#include <boost/hana/ext/std/array/array.hpp>
+#include <boost/hana/fwd/ext/std/array.hpp>
 
-// Instances
-#include <boost/hana/ext/std/array/comparable.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+#include <boost/hana/detail/std/integer_sequence.hpp>
+#include <boost/hana/detail/std/move.hpp>
+#include <boost/hana/detail/std/remove_reference.hpp>
+#include <boost/hana/detail/std/size_t.hpp>
 
-#include <boost/hana/ext/std/array/functor.hpp>
-#include <boost/hana/ext/std/array/applicative.hpp>
-#include <boost/hana/ext/std/array/monad.hpp>
-#include <boost/hana/ext/std/array/traversable.hpp>
+// instances
+#include <boost/hana/iterable.hpp>
+#include <boost/hana/list.hpp>
 
-#include <boost/hana/ext/std/array/foldable.hpp>
-#include <boost/hana/ext/std/array/iterable.hpp>
-#include <boost/hana/ext/std/array/list.hpp>
-#include <boost/hana/ext/std/array/searchable.hpp>
+#include <array>
+
+
+namespace boost { namespace hana {
+    template <>
+    struct Iterable::instance<ext::std::Array> : Iterable::mcd {
+        template <typename Xs>
+        static constexpr decltype(auto) head_impl(Xs&& xs)
+        { return detail::std::forward<Xs>(xs)[0]; }
+
+        template <typename T, detail::std::size_t N, typename Xs, detail::std::size_t ...index>
+        static constexpr auto tail_helper(Xs&& xs, detail::std::index_sequence<index...>) {
+            return ::std::array<T, N - 1>{{
+                detail::std::forward<Xs>(xs)[index + 1]...
+            }};
+        }
+
+        template <typename Xs>
+        static constexpr decltype(auto) tail_impl(Xs&& xs) {
+            using RawArray = typename detail::std::remove_reference<Xs>::type;
+            constexpr auto N = ::std::tuple_size<RawArray>::value;
+            using T = typename RawArray::value_type;
+            return tail_helper<T, N>(
+                detail::std::forward<Xs>(xs),
+                detail::std::make_index_sequence<N - 1>{}
+            );
+        }
+
+        template <typename T, detail::std::size_t N>
+        static constexpr auto is_empty_impl(::std::array<T, N> const&)
+        { return bool_<N == 0>; }
+    };
+
+    template <>
+    struct List::instance<ext::std::Array> : List::mcd<ext::std::Array> {
+        struct anything { };
+
+        static constexpr auto nil_impl()
+        { return ::std::array<anything, 0>{}; }
+
+        template <typename T, detail::std::size_t N, typename X, typename Xs, detail::std::size_t ...index>
+        static constexpr auto
+        cons_helper(X&& x, Xs&& xs, detail::std::index_sequence<index...>) {
+            return ::std::array<T, N + 1>{{
+                detail::std::forward<X>(x),
+                detail::std::forward<Xs>(xs)[index]...
+            }};
+        }
+
+        template <typename X, typename Xs>
+        static constexpr decltype(auto) cons_impl(X&& x, Xs&& xs) {
+            using RawArray = typename detail::std::remove_reference<Xs>::type;
+            constexpr auto N = ::std::tuple_size<RawArray>::value;
+            using T = typename RawArray::value_type;
+            return cons_helper<T, N>(
+                detail::std::forward<X>(x),
+                detail::std::forward<Xs>(xs),
+                detail::std::make_index_sequence<N>{}
+            );
+        }
+
+        template <typename X>
+        static constexpr auto cons_impl(X x, ::std::array<anything, 0>)
+        { return ::std::array<X, 1>{{detail::std::move(x)}}; }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_EXT_STD_ARRAY_HPP
diff --git a/include/boost/hana/ext/std/array/applicative.hpp b/include/boost/hana/ext/std/array/applicative.hpp
deleted file mode 100644
index 08eca8a94..000000000
--- a/include/boost/hana/ext/std/array/applicative.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Applicative` for `std::array`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_ARRAY_APPLICATIVE_HPP
-#define BOOST_HANA_EXT_STD_ARRAY_APPLICATIVE_HPP
-
-#include <boost/hana/ext/std/array/functor.hpp>
-#include <boost/hana/ext/std/array/list.hpp>
-#include <boost/hana/applicative/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_STD_ARRAY_APPLICATIVE_HPP
diff --git a/include/boost/hana/ext/std/array/comparable.hpp b/include/boost/hana/ext/std/array/comparable.hpp
deleted file mode 100644
index f42485885..000000000
--- a/include/boost/hana/ext/std/array/comparable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Comparable` for `std::array`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_ARRAY_COMPARABLE_HPP
-#define BOOST_HANA_EXT_STD_ARRAY_COMPARABLE_HPP
-
-#include <boost/hana/ext/std/array/list.hpp>
-#include <boost/hana/comparable/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_STD_ARRAY_COMPARABLE_HPP
diff --git a/include/boost/hana/ext/std/array/foldable.hpp b/include/boost/hana/ext/std/array/foldable.hpp
deleted file mode 100644
index a8092a45d..000000000
--- a/include/boost/hana/ext/std/array/foldable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Foldable` for `std::array`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_ARRAY_FOLDABLE_HPP
-#define BOOST_HANA_EXT_STD_ARRAY_FOLDABLE_HPP
-
-#include <boost/hana/ext/std/array/iterable.hpp>
-#include <boost/hana/foldable/iterable_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_STD_ARRAY_FOLDABLE_HPP
diff --git a/include/boost/hana/ext/std/array/functor.hpp b/include/boost/hana/ext/std/array/functor.hpp
deleted file mode 100644
index b04357030..000000000
--- a/include/boost/hana/ext/std/array/functor.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Functor` for `std::array`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_ARRAY_FUNCTOR_HPP
-#define BOOST_HANA_EXT_STD_ARRAY_FUNCTOR_HPP
-
-#include <boost/hana/ext/std/array/list.hpp>
-#include <boost/hana/functor/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_STD_ARRAY_FUNCTOR_HPP
diff --git a/include/boost/hana/ext/std/array/iterable.hpp b/include/boost/hana/ext/std/array/iterable.hpp
deleted file mode 100644
index e78ab56fb..000000000
--- a/include/boost/hana/ext/std/array/iterable.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Iterable` for `std::array`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_ARRAY_ITERABLE_HPP
-#define BOOST_HANA_EXT_STD_ARRAY_ITERABLE_HPP
-
-#include <boost/hana/bool.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/detail/std/integer_sequence.hpp>
-#include <boost/hana/detail/std/remove_reference.hpp>
-#include <boost/hana/detail/std/size_t.hpp>
-#include <boost/hana/ext/std/array/array.hpp>
-#include <boost/hana/iterable/mcd.hpp>
-
-#include <array>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct Iterable::instance<StdArray> : Iterable::mcd {
-        template <typename Xs>
-        static constexpr decltype(auto) head_impl(Xs&& xs)
-        { return detail::std::forward<Xs>(xs)[0]; }
-
-        template <typename T, detail::std::size_t N, typename Xs, detail::std::size_t ...index>
-        static constexpr auto tail_helper(Xs&& xs, detail::std::index_sequence<index...>) {
-            return std::array<T, N - 1>{{
-                detail::std::forward<Xs>(xs)[index + 1]...
-            }};
-        }
-
-        template <typename Xs>
-        static constexpr decltype(auto) tail_impl(Xs&& xs) {
-            using RawArray = typename detail::std::remove_reference<Xs>::type;
-            constexpr auto N = std::tuple_size<RawArray>::value;
-            using T = typename RawArray::value_type;
-            return tail_helper<T, N>(
-                detail::std::forward<Xs>(xs),
-                detail::std::make_index_sequence<N - 1>{}
-            );
-        }
-
-        template <typename T, detail::std::size_t N>
-        static constexpr auto is_empty_impl(std::array<T, N> const&)
-        { return bool_<N == 0>; }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_STD_ARRAY_ITERABLE_HPP
diff --git a/include/boost/hana/ext/std/array/list.hpp b/include/boost/hana/ext/std/array/list.hpp
deleted file mode 100644
index 63f96fc15..000000000
--- a/include/boost/hana/ext/std/array/list.hpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::List` for `std::array`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_ARRAY_LIST_HPP
-#define BOOST_HANA_EXT_STD_ARRAY_LIST_HPP
-
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/detail/std/integer_sequence.hpp>
-#include <boost/hana/detail/std/move.hpp>
-#include <boost/hana/detail/std/remove_reference.hpp>
-#include <boost/hana/detail/std/size_t.hpp>
-#include <boost/hana/ext/std/array/foldable.hpp>
-#include <boost/hana/ext/std/array/iterable.hpp>
-#include <boost/hana/ext/std/array/monad.hpp>
-#include <boost/hana/list/mcd.hpp>
-
-#include <array>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct List::instance<StdArray> : List::mcd<StdArray> {
-        struct anything { };
-
-        static constexpr auto nil_impl()
-        { return std::array<anything, 0>{}; }
-
-        template <typename T, detail::std::size_t N, typename X, typename Xs, detail::std::size_t ...index>
-        static constexpr auto
-        cons_helper(X&& x, Xs&& xs, detail::std::index_sequence<index...>) {
-            return std::array<T, N + 1>{{
-                detail::std::forward<X>(x),
-                detail::std::forward<Xs>(xs)[index]...
-            }};
-        }
-
-        template <typename X, typename Xs>
-        static constexpr decltype(auto) cons_impl(X&& x, Xs&& xs) {
-            using RawArray = typename detail::std::remove_reference<Xs>::type;
-            constexpr auto N = std::tuple_size<RawArray>::value;
-            using T = typename RawArray::value_type;
-            return cons_helper<T, N>(
-                detail::std::forward<X>(x),
-                detail::std::forward<Xs>(xs),
-                detail::std::make_index_sequence<N>{}
-            );
-        }
-
-        template <typename X>
-        static constexpr auto cons_impl(X x, std::array<anything, 0>)
-        { return std::array<X, 1>{{detail::std::move(x)}}; }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_STD_ARRAY_LIST_HPP
diff --git a/include/boost/hana/ext/std/array/monad.hpp b/include/boost/hana/ext/std/array/monad.hpp
deleted file mode 100644
index 7f87d2086..000000000
--- a/include/boost/hana/ext/std/array/monad.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Monad` for `std::array`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_ARRAY_MONAD_HPP
-#define BOOST_HANA_EXT_STD_ARRAY_MONAD_HPP
-
-#include <boost/hana/ext/std/array/applicative.hpp>
-#include <boost/hana/ext/std/array/list.hpp>
-#include <boost/hana/monad/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_STD_ARRAY_MONAD_HPP
diff --git a/include/boost/hana/ext/std/array/searchable.hpp b/include/boost/hana/ext/std/array/searchable.hpp
deleted file mode 100644
index c418781b1..000000000
--- a/include/boost/hana/ext/std/array/searchable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Searchable` for `std::array`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_ARRAY_SEARCHABLE_HPP
-#define BOOST_HANA_EXT_STD_ARRAY_SEARCHABLE_HPP
-
-#include <boost/hana/ext/std/array/list.hpp>
-#include <boost/hana/searchable/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_STD_ARRAY_SEARCHABLE_HPP
diff --git a/include/boost/hana/ext/std/array/traversable.hpp b/include/boost/hana/ext/std/array/traversable.hpp
deleted file mode 100644
index a2bcf3ee7..000000000
--- a/include/boost/hana/ext/std/array/traversable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Traversable` for `std::array`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_ARRAY_TRAVERSABLE_HPP
-#define BOOST_HANA_EXT_STD_ARRAY_TRAVERSABLE_HPP
-
-#include <boost/hana/ext/std/array/list.hpp>
-#include <boost/hana/traversable/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_STD_ARRAY_TRAVERSABLE_HPP
diff --git a/include/boost/hana/ext/std/integer_sequence.hpp b/include/boost/hana/ext/std/integer_sequence.hpp
index bd966f217..7b8212b9c 100644
--- a/include/boost/hana/ext/std/integer_sequence.hpp
+++ b/include/boost/hana/ext/std/integer_sequence.hpp
@@ -1,6 +1,6 @@
 /*!
 @file
-Defines `boost::hana::StdIntegerSequence`.
+Defines `boost::hana::ext::std::IntegerSequence`.
 
 @copyright Louis Dionne 2014
 Distributed under the Boost Software License, Version 1.0.
@@ -10,11 +10,58 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_EXT_STD_INTEGER_SEQUENCE_HPP
 #define BOOST_HANA_EXT_STD_INTEGER_SEQUENCE_HPP
 
-#include <boost/hana/ext/std/integer_sequence/integer_sequence.hpp>
+#include <boost/hana/fwd/ext/std/integer_sequence.hpp>
 
-// Instances
-#include <boost/hana/ext/std/integer_sequence/comparable.hpp>
-#include <boost/hana/ext/std/integer_sequence/foldable.hpp>
-#include <boost/hana/ext/std/integer_sequence/iterable.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/detail/std/is_same.hpp>
+#include <boost/hana/ext/std/integral_constant.hpp>
+
+// instances
+#include <boost/hana/comparable.hpp>
+#include <boost/hana/iterable.hpp>
+
+#include <type_traits>
+#include <utility>
+
+
+namespace boost { namespace hana {
+    template <>
+    struct Comparable::instance<ext::std::IntegerSequence, ext::std::IntegerSequence>
+        : Comparable::equal_mcd
+    {
+        template <typename X, X ...xs, typename Y, Y ...ys>
+        static constexpr auto equal_impl(
+            ::std::integer_sequence<X, xs...>,
+            ::std::integer_sequence<Y, ys...>,
+            // this dummy parameter disables this specialization if
+            // sizeof...(xs) != sizeof...(ys)
+            char(*)[sizeof...(xs) == sizeof...(ys)] = 0)
+        {
+            return bool_<detail::std::is_same<
+                ::std::integer_sequence<bool, (xs == ys)...>,
+                ::std::integer_sequence<bool, (xs, true)...>
+            >::value>;
+        }
+
+        template <typename Xs, typename Ys>
+        static constexpr auto equal_impl(Xs, Ys, ...)
+        { return false_; }
+    };
+
+    template <>
+    struct Iterable::instance<ext::std::IntegerSequence> : Iterable::mcd {
+        template <typename T, T x, T ...xs>
+        static constexpr auto head_impl(::std::integer_sequence<T, x, xs...>)
+        { return ::std::integral_constant<T, x>{}; }
+
+        template <typename T, T x, T ...xs>
+        static constexpr auto tail_impl(::std::integer_sequence<T, x, xs...>)
+        { return ::std::integer_sequence<T, xs...>{}; }
+
+        template <typename T, T ...xs>
+        static constexpr auto is_empty_impl(::std::integer_sequence<T, xs...>)
+        { return bool_<sizeof...(xs) == 0>; }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_EXT_STD_INTEGER_SEQUENCE_HPP
diff --git a/include/boost/hana/ext/std/integer_sequence/comparable.hpp b/include/boost/hana/ext/std/integer_sequence/comparable.hpp
deleted file mode 100644
index 861f2bc71..000000000
--- a/include/boost/hana/ext/std/integer_sequence/comparable.hpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Comparable` for `std::integer_sequence`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_INTEGER_SEQUENCE_COMPARABLE_HPP
-#define BOOST_HANA_EXT_STD_INTEGER_SEQUENCE_COMPARABLE_HPP
-
-#include <boost/hana/bool.hpp>
-#include <boost/hana/comparable/equal_mcd.hpp>
-#include <boost/hana/detail/std/is_same.hpp>
-#include <boost/hana/ext/std/integer_sequence/integer_sequence.hpp>
-
-#include <utility>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct Comparable::instance<StdIntegerSequence, StdIntegerSequence>
-        : Comparable::equal_mcd
-    {
-        template <typename X, X ...xs, typename Y, Y ...ys>
-        static constexpr auto equal_impl(
-            std::integer_sequence<X, xs...>,
-            std::integer_sequence<Y, ys...>,
-            // this dummy parameter disables this specialization if
-            // sizeof...(xs) != sizeof...(ys)
-            char(*)[sizeof...(xs) == sizeof...(ys)] = 0)
-        {
-            return bool_<detail::std::is_same<
-                std::integer_sequence<bool, (xs == ys)...>,
-                std::integer_sequence<bool, (xs, true)...>
-            >::value>;
-        }
-
-        template <typename Xs, typename Ys>
-        static constexpr auto equal_impl(Xs, Ys, ...)
-        { return false_; }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_STD_INTEGER_SEQUENCE_COMPARABLE_HPP
diff --git a/include/boost/hana/ext/std/integer_sequence/foldable.hpp b/include/boost/hana/ext/std/integer_sequence/foldable.hpp
deleted file mode 100644
index 28cc9c981..000000000
--- a/include/boost/hana/ext/std/integer_sequence/foldable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Foldable` for `std::integer_sequence`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_INTEGER_SEQUENCE_FOLDABLE_HPP
-#define BOOST_HANA_EXT_STD_INTEGER_SEQUENCE_FOLDABLE_HPP
-
-#include <boost/hana/ext/std/integer_sequence/iterable.hpp>
-#include <boost/hana/foldable/iterable_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_STD_INTEGER_SEQUENCE_FOLDABLE_HPP
diff --git a/include/boost/hana/ext/std/integer_sequence/integer_sequence.hpp b/include/boost/hana/ext/std/integer_sequence/integer_sequence.hpp
deleted file mode 100644
index d51e05664..000000000
--- a/include/boost/hana/ext/std/integer_sequence/integer_sequence.hpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/*!
-@file
-Forward declares `boost::hana::StdIntegerSequence`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_INTEGER_SEQUENCE_INTEGER_SEQUENCE_HPP
-#define BOOST_HANA_EXT_STD_INTEGER_SEQUENCE_INTEGER_SEQUENCE_HPP
-
-#include <boost/hana/core/datatype.hpp>
-
-#include <utility>
-
-
-namespace boost { namespace hana {
-    struct StdIntegerSequence;
-
-    template <typename T, T ...v>
-    struct datatype<std::integer_sequence<T, v...>> {
-        using type = StdIntegerSequence;
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_STD_INTEGER_SEQUENCE_INTEGER_SEQUENCE_HPP
diff --git a/include/boost/hana/ext/std/integer_sequence/iterable.hpp b/include/boost/hana/ext/std/integer_sequence/iterable.hpp
deleted file mode 100644
index 8e898a8c4..000000000
--- a/include/boost/hana/ext/std/integer_sequence/iterable.hpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Iterable` for `std::integer_sequence`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_INTEGER_SEQUENCE_ITERABLE_HPP
-#define BOOST_HANA_EXT_STD_INTEGER_SEQUENCE_ITERABLE_HPP
-
-#include <boost/hana/bool.hpp>
-#include <boost/hana/ext/std/integer_sequence/integer_sequence.hpp>
-#include <boost/hana/ext/std/integral_constant.hpp>
-#include <boost/hana/iterable/mcd.hpp>
-
-#include <type_traits>
-#include <utility>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct Iterable::instance<StdIntegerSequence> : Iterable::mcd {
-        template <typename T, T x, T ...xs>
-        static constexpr auto head_impl(std::integer_sequence<T, x, xs...>)
-        { return std::integral_constant<T, x>{}; }
-
-        template <typename T, T x, T ...xs>
-        static constexpr auto tail_impl(std::integer_sequence<T, x, xs...>)
-        { return std::integer_sequence<T, xs...>{}; }
-
-        template <typename T, T ...xs>
-        static constexpr auto is_empty_impl(std::integer_sequence<T, xs...>)
-        { return bool_<sizeof...(xs) == 0>; }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_STD_INTEGER_SEQUENCE_ITERABLE_HPP
diff --git a/include/boost/hana/ext/std/integral_constant.hpp b/include/boost/hana/ext/std/integral_constant.hpp
index fec676581..0e6f5eb74 100644
--- a/include/boost/hana/ext/std/integral_constant.hpp
+++ b/include/boost/hana/ext/std/integral_constant.hpp
@@ -1,6 +1,6 @@
 /*!
 @file
-Defines `boost::hana::StdIntegralConstant`.
+Defines `boost::hana::ext::std::IntegralConstant`.
 
 @copyright Louis Dionne 2014
 Distributed under the Boost Software License, Version 1.0.
@@ -10,20 +10,31 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_HPP
 #define BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_HPP
 
-#include <boost/hana/ext/std/integral_constant/fwd.hpp>
+#include <boost/hana/fwd/ext/std/integral_constant.hpp>
 
-// Instances
-#include <boost/hana/ext/std/integral_constant/constant.hpp>
-#include <boost/hana/ext/std/integral_constant/integral_constant.hpp>
+// instances
+#include <boost/hana/constant.hpp>
+#include <boost/hana/integral_constant.hpp>
 
-#include <boost/hana/ext/std/integral_constant/comparable.hpp>
-#include <boost/hana/ext/std/integral_constant/orderable.hpp>
-#include <boost/hana/ext/std/integral_constant/logical.hpp>
-#include <boost/hana/ext/std/integral_constant/enumerable.hpp>
+#include <type_traits>
 
-#include <boost/hana/ext/std/integral_constant/monoid.hpp>
-#include <boost/hana/ext/std/integral_constant/group.hpp>
-#include <boost/hana/ext/std/integral_constant/ring.hpp>
-#include <boost/hana/ext/std/integral_constant/integral_domain.hpp>
+
+namespace boost { namespace hana {
+    template <>
+    struct Constant::instance<ext::std::IntegralConstant> : Constant::mcd {
+        template <typename C>
+        static constexpr auto value_impl(C const&)
+        { return C::value; }
+    };
+
+    template <>
+    struct IntegralConstant::instance<ext::std::IntegralConstant>
+        : IntegralConstant::mcd
+    {
+        template <typename T, T v>
+        static constexpr auto integral_constant_impl()
+        { return ::std::integral_constant<T, v>{}; }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_HPP
diff --git a/include/boost/hana/ext/std/integral_constant/comparable.hpp b/include/boost/hana/ext/std/integral_constant/comparable.hpp
deleted file mode 100644
index 7291482c1..000000000
--- a/include/boost/hana/ext/std/integral_constant/comparable.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Comparable` for
-`boost::hana::StdIntegralConstant`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_COMPARABLE_HPP
-#define BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_COMPARABLE_HPP
-
-#include <boost/hana/ext/std/integral_constant/integral_constant.hpp>
-#include <boost/hana/comparable/integral_constant_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_COMPARABLE_HPP
diff --git a/include/boost/hana/ext/std/integral_constant/constant.hpp b/include/boost/hana/ext/std/integral_constant/constant.hpp
deleted file mode 100644
index b263ad864..000000000
--- a/include/boost/hana/ext/std/integral_constant/constant.hpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Constant` for
-`boost::hana::StdIntegralConstant`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_CONSTANT_HPP
-#define BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_CONSTANT_HPP
-
-#include <boost/hana/constant/mcd.hpp>
-#include <boost/hana/ext/std/integral_constant/fwd.hpp>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct Constant::instance<StdIntegralConstant> : Constant::mcd {
-        template <typename C>
-        static constexpr auto value_impl(C const&)
-        { return C::value; }
-    };
-}}
-
-#endif // !BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_CONSTANT_HPP
diff --git a/include/boost/hana/ext/std/integral_constant/enumerable.hpp b/include/boost/hana/ext/std/integral_constant/enumerable.hpp
deleted file mode 100644
index d0cc96f1f..000000000
--- a/include/boost/hana/ext/std/integral_constant/enumerable.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Enumerable` for
-`boost::hana::StdIntegralConstant`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_ENUMERABLE_HPP
-#define BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_ENUMERABLE_HPP
-
-#include <boost/hana/ext/std/integral_constant/integral_constant.hpp>
-#include <boost/hana/enumerable/integral_constant_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_ENUMERABLE_HPP
diff --git a/include/boost/hana/ext/std/integral_constant/group.hpp b/include/boost/hana/ext/std/integral_constant/group.hpp
deleted file mode 100644
index d4f5b93bd..000000000
--- a/include/boost/hana/ext/std/integral_constant/group.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Group` for
-`boost::hana::StdIntegralConstant`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_GROUP_HPP
-#define BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_GROUP_HPP
-
-#include <boost/hana/ext/std/integral_constant/integral_constant.hpp>
-#include <boost/hana/group/integral_constant_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_GROUP_HPP
diff --git a/include/boost/hana/ext/std/integral_constant/integral_constant.hpp b/include/boost/hana/ext/std/integral_constant/integral_constant.hpp
deleted file mode 100644
index 686094b74..000000000
--- a/include/boost/hana/ext/std/integral_constant/integral_constant.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::IntegralConstant` for
-`boost::hana::StdIntegralConstant`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_INTEGRAL_CONSTANT_HPP
-#define BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_INTEGRAL_CONSTANT_HPP
-
-#include <boost/hana/ext/std/integral_constant/fwd.hpp>
-#include <boost/hana/integral_constant/mcd.hpp>
-
-// Mcd
-#include <boost/hana/ext/std/integral_constant/constant.hpp>
-
-#include <type_traits>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct IntegralConstant::instance<StdIntegralConstant>
-        : IntegralConstant::mcd
-    {
-        template <typename T, T v>
-        static constexpr auto integral_constant_impl()
-        { return std::integral_constant<T, v>{}; }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_INTEGRAL_CONSTANT_HPP
diff --git a/include/boost/hana/ext/std/integral_constant/integral_domain.hpp b/include/boost/hana/ext/std/integral_constant/integral_domain.hpp
deleted file mode 100644
index abfa228b2..000000000
--- a/include/boost/hana/ext/std/integral_constant/integral_domain.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::IntegralDomain` for
-`boost::hana::StdIntegralConstant`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_INTEGRAL_DOMAIN_HPP
-#define BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_INTEGRAL_DOMAIN_HPP
-
-#include <boost/hana/ext/std/integral_constant/integral_constant.hpp>
-#include <boost/hana/integral_domain/integral_constant_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_INTEGRAL_DOMAIN_HPP
diff --git a/include/boost/hana/ext/std/integral_constant/logical.hpp b/include/boost/hana/ext/std/integral_constant/logical.hpp
deleted file mode 100644
index e4589a929..000000000
--- a/include/boost/hana/ext/std/integral_constant/logical.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Logical` for
-`boost::hana::StdIntegralConstant`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_LOGICAL_HPP
-#define BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_LOGICAL_HPP
-
-#include <boost/hana/ext/std/integral_constant/integral_constant.hpp>
-#include <boost/hana/logical/integral_constant_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_LOGICAL_HPP
diff --git a/include/boost/hana/ext/std/integral_constant/monoid.hpp b/include/boost/hana/ext/std/integral_constant/monoid.hpp
deleted file mode 100644
index caf657382..000000000
--- a/include/boost/hana/ext/std/integral_constant/monoid.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Monoid` for
-`boost::hana::StdIntegralConstant`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_MONOID_HPP
-#define BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_MONOID_HPP
-
-#include <boost/hana/ext/std/integral_constant/integral_constant.hpp>
-#include <boost/hana/monoid/integral_constant_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_MONOID_HPP
diff --git a/include/boost/hana/ext/std/integral_constant/orderable.hpp b/include/boost/hana/ext/std/integral_constant/orderable.hpp
deleted file mode 100644
index 6ea0149f1..000000000
--- a/include/boost/hana/ext/std/integral_constant/orderable.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Orderable` for
-`boost::hana::StdIntegralConstant`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_ORDERABLE_HPP
-#define BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_ORDERABLE_HPP
-
-#include <boost/hana/ext/std/integral_constant/integral_constant.hpp>
-#include <boost/hana/orderable/integral_constant_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_ORDERABLE_HPP
diff --git a/include/boost/hana/ext/std/integral_constant/ring.hpp b/include/boost/hana/ext/std/integral_constant/ring.hpp
deleted file mode 100644
index c96b80127..000000000
--- a/include/boost/hana/ext/std/integral_constant/ring.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Ring` for
-`boost::hana::StdIntegralConstant`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_RING_HPP
-#define BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_RING_HPP
-
-#include <boost/hana/ext/std/integral_constant/integral_constant.hpp>
-#include <boost/hana/ring/integral_constant_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_RING_HPP
diff --git a/include/boost/hana/ext/std/pair.hpp b/include/boost/hana/ext/std/pair.hpp
index 8c51fe768..eebc55ce3 100644
--- a/include/boost/hana/ext/std/pair.hpp
+++ b/include/boost/hana/ext/std/pair.hpp
@@ -1,6 +1,6 @@
 /*!
 @file
-Defines `boost::hana::StdPair`.
+Defines `boost::hana::ext::std::Pair`.
 
 @copyright Louis Dionne 2014
 Distributed under the Boost Software License, Version 1.0.
@@ -10,11 +10,37 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_EXT_STD_PAIR_HPP
 #define BOOST_HANA_EXT_STD_PAIR_HPP
 
-#include <boost/hana/ext/std/pair/pair.hpp>
+#include <boost/hana/fwd/ext/std/pair.hpp>
 
-// Instances
-#include <boost/hana/ext/std/pair/comparable.hpp>
-#include <boost/hana/ext/std/pair/foldable.hpp>
-#include <boost/hana/ext/std/pair/product.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+
+// instances
+#include <boost/hana/product.hpp>
+
+#include <utility>
+
+
+namespace boost { namespace hana {
+    template <>
+    struct Product::instance<ext::std::Pair> : Product::mcd {
+        template <typename X, typename Y>
+        static decltype(auto) make_impl(X&& x, Y&& y) {
+            return ::std::make_pair(
+                detail::std::forward<X>(x),
+                detail::std::forward<Y>(y)
+            );
+        }
+
+        template <typename P>
+        static decltype(auto) first_impl(P&& p) {
+            return detail::std::forward<P>(p).first;
+        }
+
+        template <typename P>
+        static decltype(auto) second_impl(P&& p) {
+            return detail::std::forward<P>(p).second;
+        }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_EXT_STD_PAIR_HPP
diff --git a/include/boost/hana/ext/std/pair/comparable.hpp b/include/boost/hana/ext/std/pair/comparable.hpp
deleted file mode 100644
index fd845175c..000000000
--- a/include/boost/hana/ext/std/pair/comparable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Comparable` for `std::pair`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_PAIR_COMPARABLE_HPP
-#define BOOST_HANA_EXT_STD_PAIR_COMPARABLE_HPP
-
-#include <boost/hana/ext/std/pair/product.hpp>
-#include <boost/hana/comparable/product_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_STD_PAIR_COMPARABLE_HPP
diff --git a/include/boost/hana/ext/std/pair/foldable.hpp b/include/boost/hana/ext/std/pair/foldable.hpp
deleted file mode 100644
index 66e6f3562..000000000
--- a/include/boost/hana/ext/std/pair/foldable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Foldable` for `std::pair`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_PAIR_FOLDABLE_HPP
-#define BOOST_HANA_EXT_STD_PAIR_FOLDABLE_HPP
-
-#include <boost/hana/ext/std/pair/product.hpp>
-#include <boost/hana/foldable/product_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_STD_PAIR_FOLDABLE_HPP
diff --git a/include/boost/hana/ext/std/pair/product.hpp b/include/boost/hana/ext/std/pair/product.hpp
deleted file mode 100644
index 1f11dec6f..000000000
--- a/include/boost/hana/ext/std/pair/product.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Product` for `std::pair`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_PAIR_PRODUCT_HPP
-#define BOOST_HANA_EXT_STD_PAIR_PRODUCT_HPP
-
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/ext/std/pair/pair.hpp>
-#include <boost/hana/product/mcd.hpp>
-
-#include <utility>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct Product::instance<StdPair> : Product::mcd {
-        template <typename X, typename Y>
-        static decltype(auto) make_impl(X&& x, Y&& y) {
-            return std::make_pair(
-                detail::std::forward<X>(x),
-                detail::std::forward<Y>(y)
-            );
-        }
-
-        template <typename P>
-        static decltype(auto) first_impl(P&& p) {
-            return detail::std::forward<P>(p).first;
-        }
-
-        template <typename P>
-        static decltype(auto) second_impl(P&& p) {
-            return detail::std::forward<P>(p).second;
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_STD_PAIR_PRODUCT_HPP
diff --git a/include/boost/hana/ext/std/ratio.hpp b/include/boost/hana/ext/std/ratio.hpp
index 4e8079e13..efa1add8e 100644
--- a/include/boost/hana/ext/std/ratio.hpp
+++ b/include/boost/hana/ext/std/ratio.hpp
@@ -1,6 +1,6 @@
 /*!
 @file
-Defines `boost::hana::StdRatio`.
+Defines `boost::hana::ext::std::Ratio`.
 
 @copyright Louis Dionne 2014
 Distributed under the Boost Software License, Version 1.0.
@@ -10,16 +10,103 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_EXT_STD_RATIO_HPP
 #define BOOST_HANA_EXT_STD_RATIO_HPP
 
-#include <boost/hana/ext/std/ratio/ratio.hpp>
-#include <boost/hana/ext/std/ratio/convert.hpp>
+#include <boost/hana/fwd/ext/std/ratio.hpp>
 
-// Instances
-#include <boost/hana/ext/std/ratio/comparable.hpp>
-#include <boost/hana/ext/std/ratio/orderable.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/core/convert.hpp>
+#include <boost/hana/core/is_a.hpp>
+#include <boost/hana/core/when.hpp>
+#include <boost/hana/integral_constant.hpp>
 
-#include <boost/hana/ext/std/ratio/monoid.hpp>
-#include <boost/hana/ext/std/ratio/group.hpp>
-#include <boost/hana/ext/std/ratio/ring.hpp>
-#include <boost/hana/ext/std/ratio/integral_domain.hpp>
+// instances
+#include <boost/hana/comparable.hpp>
+#include <boost/hana/group.hpp>
+#include <boost/hana/integral_domain.hpp>
+#include <boost/hana/monoid.hpp>
+#include <boost/hana/orderable.hpp>
+#include <boost/hana/ring.hpp>
+
+#include <ratio>
+
+
+namespace boost { namespace hana {
+    template <>
+    struct Comparable::instance<ext::std::Ratio, ext::std::Ratio>
+        : Comparable::equal_mcd
+    {
+        template <typename R1, typename R2>
+        static constexpr decltype(auto) equal_impl(R1, R2) {
+            return bool_<::std::ratio_equal<R1, R2>::value>;
+        }
+    };
+
+    template <typename I>
+    struct convert<ext::std::Ratio, I, when<is_an<IntegralConstant, I>()>> {
+        template <typename N>
+        static constexpr auto apply(N n) {
+            constexpr auto v = value(n);
+            return ::std::ratio<v>{};
+        }
+    };
+
+    template <>
+    struct Group::instance<ext::std::Ratio, ext::std::Ratio>
+        : Group::minus_mcd<ext::std::Ratio, ext::std::Ratio>
+    {
+        template <typename R1, typename R2>
+        static constexpr decltype(auto) minus_impl(R1, R2) {
+            return ::std::ratio_subtract<R1, R2>{};
+        }
+    };
+
+    template <>
+    struct IntegralDomain::instance<ext::std::Ratio, ext::std::Ratio>
+        : IntegralDomain::mcd
+    {
+        template <typename R1, typename R2>
+        static constexpr decltype(auto) quot_impl(R1, R2) {
+            return ::std::ratio_divide<R1, R2>{};
+        }
+
+        template <typename R1, typename R2>
+        static constexpr decltype(auto) mod_impl(R1, R2) {
+            return ::std::ratio<0>{};
+        }
+    };
+
+    template <>
+    struct Monoid::instance<ext::std::Ratio, ext::std::Ratio> : Monoid::mcd {
+        template <typename R1, typename R2>
+        static constexpr decltype(auto) plus_impl(R1, R2) {
+            return ::std::ratio_add<R1, R2>{};
+        }
+
+        static constexpr decltype(auto) zero_impl() {
+            return ::std::ratio<0>{};
+        }
+    };
+
+    template <>
+    struct Orderable::instance<ext::std::Ratio, ext::std::Ratio>
+        : Orderable::less_mcd
+    {
+        template <typename R1, typename R2>
+        static constexpr decltype(auto) less_impl(R1, R2) {
+            return bool_<::std::ratio_less<R1, R2>::value>;
+        }
+    };
+
+    template <>
+    struct Ring::instance<ext::std::Ratio, ext::std::Ratio> : Ring::mcd {
+        template <typename R1, typename R2>
+        static constexpr decltype(auto) mult_impl(R1, R2) {
+            return ::std::ratio_multiply<R1, R2>{};
+        }
+
+        static constexpr decltype(auto) one_impl() {
+            return ::std::ratio<1>{};
+        }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_EXT_STD_RATIO_HPP
diff --git a/include/boost/hana/ext/std/ratio/comparable.hpp b/include/boost/hana/ext/std/ratio/comparable.hpp
deleted file mode 100644
index d48a5afa2..000000000
--- a/include/boost/hana/ext/std/ratio/comparable.hpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Comparable` for `std::ratio`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_RATIO_COMPARABLE_HPP
-#define BOOST_HANA_EXT_STD_RATIO_COMPARABLE_HPP
-
-#include <boost/hana/bool.hpp>
-#include <boost/hana/comparable/equal_mcd.hpp>
-#include <boost/hana/ext/std/ratio/ratio.hpp>
-
-#include <ratio>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct Comparable::instance<StdRatio, StdRatio> : Comparable::equal_mcd {
-        template <typename R1, typename R2>
-        static constexpr decltype(auto) equal_impl(R1, R2) {
-            return bool_<std::ratio_equal<R1, R2>::value>;
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_STD_RATIO_COMPARABLE_HPP
diff --git a/include/boost/hana/ext/std/ratio/convert.hpp b/include/boost/hana/ext/std/ratio/convert.hpp
deleted file mode 100644
index 35be37c15..000000000
--- a/include/boost/hana/ext/std/ratio/convert.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*!
-@file
-Defines conversions to `std::ratio`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_RATIO_CONVERT_HPP
-#define BOOST_HANA_EXT_STD_RATIO_CONVERT_HPP
-
-#include <boost/hana/core/convert.hpp>
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/ext/std/ratio/ratio.hpp>
-#include <boost/hana/integral_constant/integral_constant.hpp>
-
-#include <ratio>
-
-
-namespace boost { namespace hana {
-    template <typename I>
-    struct convert<StdRatio, I, when<is_an<IntegralConstant, I>()>> {
-        template <typename N>
-        static constexpr auto apply(N n) {
-            constexpr auto v = value(n);
-            return std::ratio<v>{};
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_STD_RATIO_CONVERT_HPP
diff --git a/include/boost/hana/ext/std/ratio/group.hpp b/include/boost/hana/ext/std/ratio/group.hpp
deleted file mode 100644
index 29f3d5d0a..000000000
--- a/include/boost/hana/ext/std/ratio/group.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Group` for `std::ratio`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_RATIO_GROUP_HPP
-#define BOOST_HANA_EXT_STD_RATIO_GROUP_HPP
-
-#include <boost/hana/ext/std/ratio/ratio.hpp>
-#include <boost/hana/group/minus_mcd.hpp>
-
-// Mcd
-#include <boost/hana/ext/std/ratio/monoid.hpp>
-
-#include <ratio>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct Group::instance<StdRatio, StdRatio>
-        : Group::minus_mcd<StdRatio, StdRatio>
-    {
-        template <typename R1, typename R2>
-        static constexpr decltype(auto) minus_impl(R1, R2) {
-            return std::ratio_subtract<R1, R2>{};
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_STD_RATIO_GROUP_HPP
diff --git a/include/boost/hana/ext/std/ratio/integral_domain.hpp b/include/boost/hana/ext/std/ratio/integral_domain.hpp
deleted file mode 100644
index 4ac2b5a3e..000000000
--- a/include/boost/hana/ext/std/ratio/integral_domain.hpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::IntegralDomain` for `std::ratio`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_RATIO_INTEGRAL_DOMAIN_HPP
-#define BOOST_HANA_EXT_STD_RATIO_INTEGRAL_DOMAIN_HPP
-
-#include <boost/hana/ext/std/ratio/ratio.hpp>
-#include <boost/hana/integral_domain/mcd.hpp>
-
-// Mcd
-#include <boost/hana/ext/std/ratio/ring.hpp>
-
-#include <ratio>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct IntegralDomain::instance<StdRatio, StdRatio> : IntegralDomain::mcd {
-        template <typename R1, typename R2>
-        static constexpr decltype(auto) quot_impl(R1, R2) {
-            return std::ratio_divide<R1, R2>{};
-        }
-
-        template <typename R1, typename R2>
-        static constexpr decltype(auto) mod_impl(R1, R2) {
-            return std::ratio<0>{};
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_STD_RATIO_INTEGRAL_DOMAIN_HPP
diff --git a/include/boost/hana/ext/std/ratio/monoid.hpp b/include/boost/hana/ext/std/ratio/monoid.hpp
deleted file mode 100644
index d544d982c..000000000
--- a/include/boost/hana/ext/std/ratio/monoid.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Monoid` for `std::ratio`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_RATIO_MONOID_HPP
-#define BOOST_HANA_EXT_STD_RATIO_MONOID_HPP
-
-#include <boost/hana/ext/std/ratio/ratio.hpp>
-#include <boost/hana/monoid/mcd.hpp>
-
-#include <ratio>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct Monoid::instance<StdRatio, StdRatio> : Monoid::mcd {
-        template <typename R1, typename R2>
-        static constexpr decltype(auto) plus_impl(R1, R2) {
-            return std::ratio_add<R1, R2>{};
-        }
-
-        static constexpr decltype(auto) zero_impl() {
-            return std::ratio<0>{};
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_STD_RATIO_MONOID_HPP
diff --git a/include/boost/hana/ext/std/ratio/orderable.hpp b/include/boost/hana/ext/std/ratio/orderable.hpp
deleted file mode 100644
index 5472873cf..000000000
--- a/include/boost/hana/ext/std/ratio/orderable.hpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Orderable` for `std::ratio`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_RATIO_ORDERABLE_HPP
-#define BOOST_HANA_EXT_STD_RATIO_ORDERABLE_HPP
-
-#include <boost/hana/bool.hpp>
-#include <boost/hana/ext/std/ratio/ratio.hpp>
-#include <boost/hana/orderable/less_mcd.hpp>
-
-#include <ratio>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct Orderable::instance<StdRatio, StdRatio> : Orderable::less_mcd {
-        template <typename R1, typename R2>
-        static constexpr decltype(auto) less_impl(R1, R2) {
-            return bool_<std::ratio_less<R1, R2>::value>;
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_STD_RATIO_ORDERABLE_HPP
diff --git a/include/boost/hana/ext/std/ratio/ratio.hpp b/include/boost/hana/ext/std/ratio/ratio.hpp
deleted file mode 100644
index 71dd65206..000000000
--- a/include/boost/hana/ext/std/ratio/ratio.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*!
-@file
-Forward declares `boost::hana::StdRatio`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_RATIO_RATIO_HPP
-#define BOOST_HANA_EXT_STD_RATIO_RATIO_HPP
-
-#include <boost/hana/core/datatype.hpp>
-
-#include <cstdint>
-#include <ratio>
-
-
-namespace boost { namespace hana {
-    struct StdRatio;
-
-    template <std::intmax_t num, std::intmax_t den>
-    struct datatype<std::ratio<num, den>> {
-        using type = StdRatio;
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_STD_RATIO_RATIO_HPP
diff --git a/include/boost/hana/ext/std/ratio/ring.hpp b/include/boost/hana/ext/std/ratio/ring.hpp
deleted file mode 100644
index 61cca55d6..000000000
--- a/include/boost/hana/ext/std/ratio/ring.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Ring` for `std::ratio`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_RATIO_RING_HPP
-#define BOOST_HANA_EXT_STD_RATIO_RING_HPP
-
-#include <boost/hana/ext/std/ratio/ratio.hpp>
-#include <boost/hana/ring/mcd.hpp>
-
-// Mcd
-#include <boost/hana/ext/std/ratio/group.hpp>
-
-#include <ratio>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct Ring::instance<StdRatio, StdRatio> : Ring::mcd {
-        template <typename R1, typename R2>
-        static constexpr decltype(auto) mult_impl(R1, R2) {
-            return std::ratio_multiply<R1, R2>{};
-        }
-
-        static constexpr decltype(auto) one_impl() {
-            return std::ratio<1>{};
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_STD_RATIO_RING_HPP
diff --git a/include/boost/hana/ext/std/tuple.hpp b/include/boost/hana/ext/std/tuple.hpp
index d2ecd3faa..efb91b271 100644
--- a/include/boost/hana/ext/std/tuple.hpp
+++ b/include/boost/hana/ext/std/tuple.hpp
@@ -1,6 +1,6 @@
 /*!
 @file
-Defines `boost::hana::StdTuple`.
+Defines `boost::hana::ext::std::Tuple`.
 
 @copyright Louis Dionne 2014
 Distributed under the Boost Software License, Version 1.0.
@@ -10,19 +10,101 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_EXT_STD_TUPLE_HPP
 #define BOOST_HANA_EXT_STD_TUPLE_HPP
 
-#include <boost/hana/ext/std/tuple/tuple.hpp>
+#include <boost/hana/fwd/ext/std/tuple.hpp>
 
-// Instances
-#include <boost/hana/ext/std/tuple/comparable.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+#include <boost/hana/detail/std/integer_sequence.hpp>
+#include <boost/hana/detail/std/remove_reference.hpp>
+#include <boost/hana/detail/std/size_t.hpp>
 
-#include <boost/hana/ext/std/tuple/functor.hpp>
-#include <boost/hana/ext/std/tuple/applicative.hpp>
-#include <boost/hana/ext/std/tuple/monad.hpp>
-#include <boost/hana/ext/std/tuple/traversable.hpp>
+// instances
+#include <boost/hana/functor.hpp>
+#include <boost/hana/iterable.hpp>
+#include <boost/hana/list.hpp>
+#include <boost/hana/monad.hpp>
 
-#include <boost/hana/ext/std/tuple/foldable.hpp>
-#include <boost/hana/ext/std/tuple/iterable.hpp>
-#include <boost/hana/ext/std/tuple/list.hpp>
-#include <boost/hana/ext/std/tuple/searchable.hpp>
+#include <tuple>
+
+
+namespace boost { namespace hana {
+    template <>
+    struct Functor::instance<ext::std::Tuple> : Functor::fmap_mcd {
+        template <typename Xs, typename F, detail::std::size_t ...index>
+        static constexpr decltype(auto)
+        helper(Xs&& xs, F&& f, detail::std::index_sequence<index...>) {
+            return ::std::make_tuple(
+                f(::std::get<index>(detail::std::forward<Xs>(xs)))...
+            );
+        }
+
+        template <typename Xs, typename F>
+        static constexpr decltype(auto) fmap_impl(Xs&& xs, F&& f) {
+            using Raw = typename detail::std::remove_reference<Xs>::type;
+            constexpr auto N = ::std::tuple_size<Raw>::value;
+            return helper(
+                detail::std::forward<Xs>(xs),
+                detail::std::forward<F>(f),
+                detail::std::make_index_sequence<N>{}
+            );
+        }
+    };
+
+    template <>
+    struct Iterable::instance<ext::std::Tuple> : Iterable::mcd {
+        template <typename Xs>
+        static constexpr decltype(auto) head_impl(Xs&& xs) {
+            return ::std::get<0>(detail::std::forward<Xs>(xs));
+        }
+
+        template <typename Xs, detail::std::size_t ...index>
+        static constexpr decltype(auto)
+        tail_helper(Xs&& xs, detail::std::index_sequence<index...>) {
+            return ::std::make_tuple(
+                ::std::get<index + 1>(detail::std::forward<Xs>(xs))...
+            );
+        }
+
+        template <typename Xs>
+        static constexpr decltype(auto) tail_impl(Xs&& xs) {
+            using Raw = typename detail::std::remove_reference<Xs>::type;
+            constexpr auto N = ::std::tuple_size<Raw>::value;
+            return tail_helper(
+                detail::std::forward<Xs>(xs),
+                detail::std::make_index_sequence<N - 1>{}
+            );
+        }
+
+        template <typename ...Xs>
+        static constexpr auto is_empty_impl(::std::tuple<Xs...> const&)
+        { return bool_<sizeof...(Xs) == 0>; }
+    };
+
+    template <>
+    struct List::instance<ext::std::Tuple> : List::mcd<ext::std::Tuple> {
+        static constexpr auto nil_impl()
+        { return ::std::tuple<>{}; }
+
+        template <typename X, typename Xs>
+        static constexpr decltype(auto) cons_impl(X&& x, Xs&& xs) {
+            return ::std::tuple_cat(
+                ::std::make_tuple(detail::std::forward<X>(x)),
+                detail::std::forward<Xs>(xs)
+            );
+        }
+    };
+
+    template <>
+    struct Monad::instance<ext::std::Tuple> : Monad::flatten_mcd<ext::std::Tuple> {
+        template <typename ...Tuples, detail::std::size_t ...Index>
+        static constexpr auto
+        helper(::std::tuple<Tuples...> tuples, detail::std::index_sequence<Index...>)
+        { return ::std::tuple_cat(::std::get<Index>(tuples)...); }
+
+        template <typename ...Tuples>
+        static constexpr decltype(auto) flatten_impl(::std::tuple<Tuples...> tuples)
+        { return helper(tuples, detail::std::index_sequence_for<Tuples...>{}); }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_EXT_STD_TUPLE_HPP
diff --git a/include/boost/hana/ext/std/tuple/applicative.hpp b/include/boost/hana/ext/std/tuple/applicative.hpp
deleted file mode 100644
index b37762624..000000000
--- a/include/boost/hana/ext/std/tuple/applicative.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Applicative` for `std::tuple`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_TUPLE_APPLICATIVE_HPP
-#define BOOST_HANA_EXT_STD_TUPLE_APPLICATIVE_HPP
-
-#include <boost/hana/applicative/list_mcd.hpp>
-#include <boost/hana/ext/std/tuple/functor.hpp>
-#include <boost/hana/ext/std/tuple/list.hpp>
-#include <boost/hana/ext/std/tuple/monad.hpp>
-
-#endif // !BOOST_HANA_EXT_STD_TUPLE_APPLICATIVE_HPP
diff --git a/include/boost/hana/ext/std/tuple/comparable.hpp b/include/boost/hana/ext/std/tuple/comparable.hpp
deleted file mode 100644
index 9fa4d83a2..000000000
--- a/include/boost/hana/ext/std/tuple/comparable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Comparable` for `std::tuple`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_TUPLE_COMPARABLE_HPP
-#define BOOST_HANA_EXT_STD_TUPLE_COMPARABLE_HPP
-
-#include <boost/hana/ext/std/tuple/list.hpp>
-#include <boost/hana/comparable/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_STD_TUPLE_COMPARABLE_HPP
diff --git a/include/boost/hana/ext/std/tuple/foldable.hpp b/include/boost/hana/ext/std/tuple/foldable.hpp
deleted file mode 100644
index 2ad66ed52..000000000
--- a/include/boost/hana/ext/std/tuple/foldable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Foldable` for `std::tuple`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_TUPLE_FOLDABLE_HPP
-#define BOOST_HANA_EXT_STD_TUPLE_FOLDABLE_HPP
-
-#include <boost/hana/ext/std/tuple/iterable.hpp>
-#include <boost/hana/foldable/iterable_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_STD_TUPLE_FOLDABLE_HPP
diff --git a/include/boost/hana/ext/std/tuple/functor.hpp b/include/boost/hana/ext/std/tuple/functor.hpp
deleted file mode 100644
index ff4c71def..000000000
--- a/include/boost/hana/ext/std/tuple/functor.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Functor` for `std::tuple`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_TUPLE_FUNCTOR_HPP
-#define BOOST_HANA_EXT_STD_TUPLE_FUNCTOR_HPP
-
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/detail/std/integer_sequence.hpp>
-#include <boost/hana/detail/std/remove_reference.hpp>
-#include <boost/hana/detail/std/size_t.hpp>
-#include <boost/hana/ext/std/tuple/tuple.hpp>
-#include <boost/hana/functor/fmap_mcd.hpp>
-
-#include <tuple>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct Functor::instance<StdTuple> : Functor::fmap_mcd {
-        template <typename Xs, typename F, detail::std::size_t ...index>
-        static constexpr decltype(auto)
-        helper(Xs&& xs, F&& f, detail::std::index_sequence<index...>) {
-            return std::make_tuple(
-                f(std::get<index>(detail::std::forward<Xs>(xs)))...
-            );
-        }
-
-        template <typename Xs, typename F>
-        static constexpr decltype(auto) fmap_impl(Xs&& xs, F&& f) {
-            using Raw = typename detail::std::remove_reference<Xs>::type;
-            constexpr auto N = std::tuple_size<Raw>::value;
-            return helper(
-                detail::std::forward<Xs>(xs),
-                detail::std::forward<F>(f),
-                detail::std::make_index_sequence<N>{}
-            );
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_STD_TUPLE_FUNCTOR_HPP
diff --git a/include/boost/hana/ext/std/tuple/iterable.hpp b/include/boost/hana/ext/std/tuple/iterable.hpp
deleted file mode 100644
index f912122cf..000000000
--- a/include/boost/hana/ext/std/tuple/iterable.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Iterable` for `std::tuple`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_TUPLE_ITERABLE_HPP
-#define BOOST_HANA_EXT_STD_TUPLE_ITERABLE_HPP
-
-#include <boost/hana/bool.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/detail/std/integer_sequence.hpp>
-#include <boost/hana/detail/std/size_t.hpp>
-#include <boost/hana/ext/std/tuple/tuple.hpp>
-#include <boost/hana/iterable/mcd.hpp>
-
-#include <tuple>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct Iterable::instance<StdTuple> : Iterable::mcd {
-        template <typename Xs>
-        static constexpr decltype(auto) head_impl(Xs&& xs) {
-            return std::get<0>(detail::std::forward<Xs>(xs));
-        }
-
-        template <typename Xs, detail::std::size_t ...index>
-        static constexpr decltype(auto)
-        tail_helper(Xs&& xs, detail::std::index_sequence<index...>) {
-            return std::make_tuple(
-                std::get<index + 1>(detail::std::forward<Xs>(xs))...
-            );
-        }
-
-        template <typename Xs>
-        static constexpr decltype(auto) tail_impl(Xs&& xs) {
-            using Raw = typename detail::std::remove_reference<Xs>::type;
-            constexpr auto N = std::tuple_size<Raw>::value;
-            return tail_helper(
-                detail::std::forward<Xs>(xs),
-                detail::std::make_index_sequence<N - 1>{}
-            );
-        }
-
-        template <typename ...Xs>
-        static constexpr auto is_empty_impl(std::tuple<Xs...> const&)
-        { return bool_<sizeof...(Xs) == 0>; }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_STD_TUPLE_ITERABLE_HPP
diff --git a/include/boost/hana/ext/std/tuple/list.hpp b/include/boost/hana/ext/std/tuple/list.hpp
deleted file mode 100644
index cda8a46b8..000000000
--- a/include/boost/hana/ext/std/tuple/list.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Functor` for `std::tuple`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_TUPLE_LIST_HPP
-#define BOOST_HANA_EXT_STD_TUPLE_LIST_HPP
-
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/ext/std/tuple/tuple.hpp>
-#include <boost/hana/list/mcd.hpp>
-
-// Mcd
-#include <boost/hana/ext/std/tuple/foldable.hpp>
-#include <boost/hana/ext/std/tuple/iterable.hpp>
-#include <boost/hana/ext/std/tuple/monad.hpp>
-
-#include <tuple>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct List::instance<StdTuple> : List::mcd<StdTuple> {
-        static constexpr auto nil_impl()
-        { return std::tuple<>{}; }
-
-        template <typename X, typename Xs>
-        static constexpr decltype(auto) cons_impl(X&& x, Xs&& xs) {
-            return std::tuple_cat(
-                std::make_tuple(detail::std::forward<X>(x)),
-                detail::std::forward<Xs>(xs)
-            );
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_STD_TUPLE_LIST_HPP
diff --git a/include/boost/hana/ext/std/tuple/monad.hpp b/include/boost/hana/ext/std/tuple/monad.hpp
deleted file mode 100644
index 74d91e33f..000000000
--- a/include/boost/hana/ext/std/tuple/monad.hpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Monad` for `std::tuple`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_TUPLE_MONAD_HPP
-#define BOOST_HANA_EXT_STD_TUPLE_MONAD_HPP
-
-#include <boost/hana/ext/std/tuple/tuple.hpp>
-#include <boost/hana/monad/flatten_mcd.hpp>
-
-// Mcd
-#include <boost/hana/ext/std/tuple/applicative.hpp>
-
-#include <cstddef>
-#include <tuple>
-#include <utility>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct Monad::instance<StdTuple> : Monad::flatten_mcd<StdTuple> {
-        template <typename ...Tuples, std::size_t ...Index>
-        static constexpr auto
-        helper(std::tuple<Tuples...> tuples, std::index_sequence<Index...>)
-        { return std::tuple_cat(std::get<Index>(tuples)...); }
-
-        template <typename ...Tuples>
-        static constexpr auto flatten_impl(std::tuple<Tuples...> tuples)
-        { return helper(tuples, std::index_sequence_for<Tuples...>{}); }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_EXT_STD_TUPLE_MONAD_HPP
diff --git a/include/boost/hana/ext/std/tuple/searchable.hpp b/include/boost/hana/ext/std/tuple/searchable.hpp
deleted file mode 100644
index 0459a0da1..000000000
--- a/include/boost/hana/ext/std/tuple/searchable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Searchable` for `std::tuple`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_TUPLE_SEARCHABLE_HPP
-#define BOOST_HANA_EXT_STD_TUPLE_SEARCHABLE_HPP
-
-#include <boost/hana/ext/std/tuple/list.hpp>
-#include <boost/hana/searchable/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_STD_TUPLE_SEARCHABLE_HPP
diff --git a/include/boost/hana/ext/std/tuple/traversable.hpp b/include/boost/hana/ext/std/tuple/traversable.hpp
deleted file mode 100644
index 424145ddc..000000000
--- a/include/boost/hana/ext/std/tuple/traversable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Traversable` for `std::tuple`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_EXT_STD_TUPLE_TRAVERSABLE_HPP
-#define BOOST_HANA_EXT_STD_TUPLE_TRAVERSABLE_HPP
-
-#include <boost/hana/ext/std/tuple/list.hpp>
-#include <boost/hana/traversable/list_mcd.hpp>
-
-#endif // !BOOST_HANA_EXT_STD_TUPLE_TRAVERSABLE_HPP
diff --git a/include/boost/hana/foldable.hpp b/include/boost/hana/foldable.hpp
index f57d030d7..203a7e924 100644
--- a/include/boost/hana/foldable.hpp
+++ b/include/boost/hana/foldable.hpp
@@ -10,10 +10,247 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_FOLDABLE_HPP
 #define BOOST_HANA_FOLDABLE_HPP
 
-#include <boost/hana/foldable/foldable.hpp>
-#include <boost/hana/foldable/folds_mcd.hpp>
-#include <boost/hana/foldable/iterable_mcd.hpp>
-#include <boost/hana/foldable/record_mcd.hpp>
-#include <boost/hana/foldable/unpack_mcd.hpp>
+#include <boost/hana/fwd/foldable.hpp>
+
+#include <boost/hana/detail/std/forward.hpp>
+#include <boost/hana/detail/std/is_same.hpp>
+#include <boost/hana/detail/variadic/foldl.hpp>
+#include <boost/hana/detail/variadic/foldl1.hpp>
+#include <boost/hana/detail/variadic/foldr.hpp>
+#include <boost/hana/detail/variadic/foldr1.hpp>
+#include <boost/hana/detail/variadic/for_each.hpp>
+#include <boost/hana/functional/id.hpp>
+#include <boost/hana/integral.hpp>
+#include <boost/hana/logical.hpp>
+#include <boost/hana/monoid.hpp>
+#include <boost/hana/orderable.hpp>
+
+
+namespace boost { namespace hana {
+    //! @details
+    //! Minimal complete definition: `foldl` and `foldr`
+    //!
+    //! @bug
+    //! The functions in this class do not perfectly forward their captures
+    //! when it would be possible to do so, because the language does not make
+    //! it possible.
+    struct Foldable::folds_mcd {
+    private:
+        struct end { };
+
+        template <typename F>
+        struct fold1_helper {
+            F f;
+
+            template <typename X, typename Y>
+            constexpr decltype(auto) operator()(X&& x, Y&& y) const
+            { return f(detail::std::forward<X>(x), detail::std::forward<Y>(y)); }
+
+            template <typename X>
+            constexpr decltype(auto) operator()(X&& x, end) const
+            { return id(detail::std::forward<X>(x)); }
+
+            template <typename Y>
+            constexpr decltype(auto) operator()(end, Y&& y) const
+            { return id(detail::std::forward<Y>(y)); }
+        };
+
+    public:
+        template <typename Xs, typename F>
+        static constexpr decltype(auto) foldr1_impl(Xs&& xs, F&& f) {
+            decltype(auto) result = foldr(
+                detail::std::forward<Xs>(xs),
+                end{},
+                fold1_helper<F>{detail::std::forward<F>(f)}
+            );
+
+            static_assert(!detail::std::is_same<decltype(result), end>::value,
+            "boost::hana::foldr1 requires a non-empty structure");
+            return result;
+        }
+
+        template <typename Xs, typename F>
+        static constexpr decltype(auto) foldl1_impl(Xs&& xs, F&& f) {
+            decltype(auto) result = foldl(
+                detail::std::forward<Xs>(xs),
+                end{},
+                fold1_helper<F>{detail::std::forward<F>(f)}
+            );
+
+            static_assert(!detail::std::is_same<decltype(result), end>::value,
+            "boost::hana::foldl1 requires a non-empty structure");
+            return result;
+        }
+
+        template <typename Xs>
+        static constexpr decltype(auto) length_impl(Xs&& xs) {
+            auto plus1 = [](auto&& n, auto const&) -> decltype(auto) {
+                return plus(detail::std::forward<decltype(n)>(n), size_t<1>);
+            };
+            return foldl(detail::std::forward<Xs>(xs), size_t<0>, plus1);
+        }
+
+        template <typename Xs>
+        static constexpr decltype(auto) minimum_impl(Xs&& xs)
+        { return minimum_by(less, detail::std::forward<Xs>(xs)); }
+
+        template <typename Xs>
+        static constexpr decltype(auto) maximum_impl(Xs&& xs)
+        { return maximum_by(less, detail::std::forward<Xs>(xs)); }
+
+        template <typename Pred, typename Xs>
+        static constexpr decltype(auto) minimum_by_impl(Pred&& pred, Xs&& xs) {
+            return foldl1(detail::std::forward<Xs>(xs),
+                [pred(detail::std::forward<Pred>(pred))](auto&& x, auto&& y) -> decltype(auto) {
+                    // Make sure that pred(x, y) is evaluated before the other
+                    // arguments so we can safely std::forward them.
+                    decltype(auto) r = pred(x, y);
+                    return if_(detail::std::forward<decltype(r)>(r),
+                        detail::std::forward<decltype(x)>(x),
+                        detail::std::forward<decltype(y)>(y)
+                    );
+                }
+            );
+        }
+
+        template <typename Pred, typename Xs>
+        static constexpr decltype(auto) maximum_by_impl(Pred&& pred, Xs&& xs) {
+            return foldl1(detail::std::forward<Xs>(xs),
+                [pred(detail::std::forward<Pred>(pred))](auto&& x, auto&& y) -> decltype(auto) {
+                    // Make sure that pred(x, y) is evaluated before the other
+                    // arguments so we can safely std::forward them.
+                    decltype(auto) r = pred(x, y);
+                    return if_(detail::std::forward<decltype(r)>(r),
+                        detail::std::forward<decltype(y)>(y),
+                        detail::std::forward<decltype(x)>(x)
+                    );
+                }
+            );
+        }
+
+        //! @todo Make it possible to specify the Monoid that's used?
+        template <typename Xs>
+        static constexpr decltype(auto) sum_impl(Xs&& xs) {
+            using M = Integral;
+            return foldl(detail::std::forward<Xs>(xs), zero<M>, plus);
+        }
+
+        //! @todo Make it possible to specify the Ring that's used?
+        template <typename Xs>
+        static constexpr decltype(auto) product_impl(Xs&& xs) {
+            using R = Integral;
+            return foldl(detail::std::forward<Xs>(xs), one<R>, mult);
+        }
+
+        template <typename Xs, typename Pred>
+        static constexpr decltype(auto) count_impl(Xs&& xs, Pred&& pred) {
+            return foldl(detail::std::forward<Xs>(xs), size_t<0>,
+                [pred(detail::std::forward<Pred>(pred))](auto&& counter, auto&& x) -> decltype(auto) {
+                    return if_(pred(detail::std::forward<decltype(x)>(x)),
+                        plus(counter, size_t<1>),
+                        counter
+                    );
+                }
+            );
+        }
+
+        template <typename Xs, typename F>
+        static constexpr decltype(auto) unpack_impl(Xs&& xs, F&& f) {
+            return foldl(detail::std::forward<Xs>(xs), detail::std::forward<F>(f),
+                [](auto&& g, auto&& x) -> decltype(auto) {
+                    return [
+                        g(detail::std::forward<decltype(g)>(g)),
+                        x(detail::std::forward<decltype(x)>(x))
+                    ](auto&& ...y) -> decltype(auto) {
+                        return g(x, detail::std::forward<decltype(y)>(y)...);
+                    };
+                }
+            )();
+        }
+
+        template <typename Xs, typename F>
+        static constexpr decltype(auto) for_each_impl(Xs&& xs, F&& f) {
+            // we ignore the state all the way
+            foldl(detail::std::forward<Xs>(xs), 0,
+                [f(detail::std::forward<F>(f))](int ignore, auto&& x) {
+                    f(detail::std::forward<decltype(x)>(x));
+                    return 0;
+                }
+            );
+        }
+    };
+
+    //! Minimal complete definition: `unpack`
+    //!
+    //! @bug
+    //! The functions in this class do not perfectly forward their captures
+    //! when it would be possible to do so, because the language does not make
+    //! it possible.
+    struct Foldable::unpack_mcd : Foldable::folds_mcd {
+        template <typename Xs, typename S, typename F>
+        static constexpr decltype(auto) foldl_impl(Xs&& xs, S&& s, F&& f) {
+            return unpack(detail::std::forward<Xs>(xs),
+                [s(detail::std::forward<S>(s)), f(detail::std::forward<F>(f))]
+                (auto&& ...xs) -> decltype(auto) {
+                    return detail::variadic::foldl(f, s,
+                        detail::std::forward<decltype(xs)>(xs)...
+                    );
+                }
+            );
+        }
+
+        template <typename Xs, typename F>
+        static constexpr decltype(auto) foldl1_impl(Xs&& xs, F&& f) {
+            return unpack(detail::std::forward<Xs>(xs),
+                [f(detail::std::forward<F>(f))](auto&& ...xs) -> decltype(auto) {
+                    return detail::variadic::foldl1(f,
+                        detail::std::forward<decltype(xs)>(xs)...
+                    );
+                }
+            );
+        }
+
+        template <typename Xs, typename S, typename F>
+        static constexpr decltype(auto) foldr_impl(Xs&& xs, S&& s, F&& f) {
+            return unpack(detail::std::forward<Xs>(xs),
+                [s(detail::std::forward<S>(s)), f(detail::std::forward<F>(f))]
+                (auto&& ...xs) -> decltype(auto) {
+                    return detail::variadic::foldr(f, s,
+                        detail::std::forward<decltype(xs)>(xs)...
+                    );
+                }
+            );
+        }
+
+        template <typename Xs, typename F>
+        static constexpr decltype(auto) foldr1_impl(Xs&& xs, F&& f) {
+            return unpack(detail::std::forward<Xs>(xs),
+                [f(detail::std::forward<F>(f))](auto&& ...xs) -> decltype(auto) {
+                    return detail::variadic::foldr1(f,
+                        detail::std::forward<decltype(xs)>(xs)...
+                    );
+                }
+            );
+        }
+
+        template <typename Xs, typename F>
+        static constexpr decltype(auto) for_each_impl(Xs&& xs, F&& f) {
+            return unpack(detail::std::forward<Xs>(xs),
+                [f(detail::std::forward<F>(f))](auto&& ...xs) -> decltype(auto) {
+                    return detail::variadic::for_each(f,
+                        detail::std::forward<decltype(xs)>(xs)...
+                    );
+                }
+            );
+        }
+
+        template <typename Xs>
+        static constexpr decltype(auto) length_impl(Xs&& xs) {
+            return unpack(detail::std::forward<Xs>(xs), [](auto const& ...xs) {
+                return size_t<sizeof...(xs)>;
+            });
+        }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_FOLDABLE_HPP
diff --git a/include/boost/hana/foldable/folds_mcd.hpp b/include/boost/hana/foldable/folds_mcd.hpp
deleted file mode 100644
index c2f7ec638..000000000
--- a/include/boost/hana/foldable/folds_mcd.hpp
+++ /dev/null
@@ -1,179 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Foldable::folds_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_FOLDABLE_FOLDS_MCD_HPP
-#define BOOST_HANA_FOLDABLE_FOLDS_MCD_HPP
-
-#include <boost/hana/foldable/foldable.hpp>
-
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/detail/std/is_same.hpp>
-#include <boost/hana/functional/id.hpp>
-#include <boost/hana/integral.hpp>
-#include <boost/hana/logical/logical.hpp>
-#include <boost/hana/monoid/monoid.hpp>
-#include <boost/hana/orderable/orderable.hpp>
-
-
-namespace boost { namespace hana {
-    //! @details
-    //! Minimal complete definition: `foldl` and `foldr`
-    //!
-    //! @bug
-    //! The functions in this class do not perfectly forward their captures
-    //! when it would be possible to do so, because the language does not make
-    //! it possible.
-    struct Foldable::folds_mcd {
-    private:
-        struct end { };
-
-        template <typename F>
-        struct fold1_helper {
-            F f;
-
-            template <typename X, typename Y>
-            constexpr decltype(auto) operator()(X&& x, Y&& y) const
-            { return f(detail::std::forward<X>(x), detail::std::forward<Y>(y)); }
-
-            template <typename X>
-            constexpr decltype(auto) operator()(X&& x, end) const
-            { return id(detail::std::forward<X>(x)); }
-
-            template <typename Y>
-            constexpr decltype(auto) operator()(end, Y&& y) const
-            { return id(detail::std::forward<Y>(y)); }
-        };
-
-    public:
-        template <typename Xs, typename F>
-        static constexpr decltype(auto) foldr1_impl(Xs&& xs, F&& f) {
-            decltype(auto) result = foldr(
-                detail::std::forward<Xs>(xs),
-                end{},
-                fold1_helper<F>{detail::std::forward<F>(f)}
-            );
-
-            static_assert(!detail::std::is_same<decltype(result), end>::value,
-            "boost::hana::foldr1 requires a non-empty structure");
-            return result;
-        }
-
-        template <typename Xs, typename F>
-        static constexpr decltype(auto) foldl1_impl(Xs&& xs, F&& f) {
-            decltype(auto) result = foldl(
-                detail::std::forward<Xs>(xs),
-                end{},
-                fold1_helper<F>{detail::std::forward<F>(f)}
-            );
-
-            static_assert(!detail::std::is_same<decltype(result), end>::value,
-            "boost::hana::foldl1 requires a non-empty structure");
-            return result;
-        }
-
-        template <typename Xs>
-        static constexpr decltype(auto) length_impl(Xs&& xs) {
-            auto plus1 = [](auto&& n, auto const&) -> decltype(auto) {
-                return plus(detail::std::forward<decltype(n)>(n), size_t<1>);
-            };
-            return foldl(detail::std::forward<Xs>(xs), size_t<0>, plus1);
-        }
-
-        template <typename Xs>
-        static constexpr decltype(auto) minimum_impl(Xs&& xs)
-        { return minimum_by(less, detail::std::forward<Xs>(xs)); }
-
-        template <typename Xs>
-        static constexpr decltype(auto) maximum_impl(Xs&& xs)
-        { return maximum_by(less, detail::std::forward<Xs>(xs)); }
-
-        template <typename Pred, typename Xs>
-        static constexpr decltype(auto) minimum_by_impl(Pred&& pred, Xs&& xs) {
-            return foldl1(detail::std::forward<Xs>(xs),
-                [pred(detail::std::forward<Pred>(pred))](auto&& x, auto&& y) -> decltype(auto) {
-                    // Make sure that pred(x, y) is evaluated before the other
-                    // arguments so we can safely std::forward them.
-                    decltype(auto) r = pred(x, y);
-                    return if_(detail::std::forward<decltype(r)>(r),
-                        detail::std::forward<decltype(x)>(x),
-                        detail::std::forward<decltype(y)>(y)
-                    );
-                }
-            );
-        }
-
-        template <typename Pred, typename Xs>
-        static constexpr decltype(auto) maximum_by_impl(Pred&& pred, Xs&& xs) {
-            return foldl1(detail::std::forward<Xs>(xs),
-                [pred(detail::std::forward<Pred>(pred))](auto&& x, auto&& y) -> decltype(auto) {
-                    // Make sure that pred(x, y) is evaluated before the other
-                    // arguments so we can safely std::forward them.
-                    decltype(auto) r = pred(x, y);
-                    return if_(detail::std::forward<decltype(r)>(r),
-                        detail::std::forward<decltype(y)>(y),
-                        detail::std::forward<decltype(x)>(x)
-                    );
-                }
-            );
-        }
-
-        //! @todo Make it possible to specify the Monoid that's used?
-        template <typename Xs>
-        static constexpr decltype(auto) sum_impl(Xs&& xs) {
-            using M = Integral;
-            return foldl(detail::std::forward<Xs>(xs), zero<M>, plus);
-        }
-
-        //! @todo Make it possible to specify the Ring that's used?
-        template <typename Xs>
-        static constexpr decltype(auto) product_impl(Xs&& xs) {
-            using R = Integral;
-            return foldl(detail::std::forward<Xs>(xs), one<R>, mult);
-        }
-
-        template <typename Xs, typename Pred>
-        static constexpr decltype(auto) count_impl(Xs&& xs, Pred&& pred) {
-            return foldl(detail::std::forward<Xs>(xs), size_t<0>,
-                [pred(detail::std::forward<Pred>(pred))](auto&& counter, auto&& x) -> decltype(auto) {
-                    return if_(pred(detail::std::forward<decltype(x)>(x)),
-                        plus(counter, size_t<1>),
-                        counter
-                    );
-                }
-            );
-        }
-
-        template <typename Xs, typename F>
-        static constexpr decltype(auto) unpack_impl(Xs&& xs, F&& f) {
-            return foldl(detail::std::forward<Xs>(xs), detail::std::forward<F>(f),
-                [](auto&& g, auto&& x) -> decltype(auto) {
-                    return [
-                        g(detail::std::forward<decltype(g)>(g)),
-                        x(detail::std::forward<decltype(x)>(x))
-                    ](auto&& ...y) -> decltype(auto) {
-                        return g(x, detail::std::forward<decltype(y)>(y)...);
-                    };
-                }
-            )();
-        }
-
-        template <typename Xs, typename F>
-        static constexpr decltype(auto) for_each_impl(Xs&& xs, F&& f) {
-            // we ignore the state all the way
-            foldl(detail::std::forward<Xs>(xs), 0,
-                [f(detail::std::forward<F>(f))](int ignore, auto&& x) {
-                    f(detail::std::forward<decltype(x)>(x));
-                    return 0;
-                }
-            );
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_FOLDABLE_FOLDS_MCD_HPP
diff --git a/include/boost/hana/foldable/iterable_mcd.hpp b/include/boost/hana/foldable/iterable_mcd.hpp
deleted file mode 100644
index e31e8448f..000000000
--- a/include/boost/hana/foldable/iterable_mcd.hpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Foldable::iterable_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_FOLDABLE_ITERABLE_MCD_HPP
-#define BOOST_HANA_FOLDABLE_ITERABLE_MCD_HPP
-
-#include <boost/hana/foldable/folds_mcd.hpp>
-
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/iterable/iterable.hpp>
-#include <boost/hana/logical/logical.hpp>
-
-
-namespace boost { namespace hana {
-    //! @details
-    //! Minimal complete definition: `Iterable`
-    //!
-    //! @todo Add perfect forwarding where possible. This is _not_ obvious
-    //! to me because of all those branches.
-    struct Foldable::iterable_mcd : Foldable::folds_mcd {
-        template <typename Xs, typename State, typename F>
-        static constexpr auto foldl_impl(Xs xs, State s, F f) {
-            return eval_if(is_empty(xs),
-                [=](auto) { return s; },
-                [=](auto _) {
-                    return foldl_impl(tail(_(xs)), f(s, head(_(xs))), f);
-                }
-            );
-        }
-
-        template <typename Xs, typename F>
-        static constexpr auto foldl1_impl(Xs xs, F f)
-        { return foldl(tail(xs), head(xs), f); }
-
-        template <typename Xs, typename F>
-        static constexpr auto foldr1_impl(Xs xs, F f) {
-            return eval_if(is_empty(tail(xs)),
-                [=](auto) { return head(xs); },
-                [=](auto _) {
-                    return f(head(xs), foldr1_impl(tail(_(xs)), f));
-                }
-            );
-        }
-
-        template <typename Xs, typename State, typename F>
-        static constexpr auto foldr_impl(Xs xs, State s, F f) {
-            return eval_if(is_empty(xs),
-                [=](auto) { return s; },
-                [=](auto _) {
-                    return f(head(_(xs)), foldr_impl(tail(_(xs)), s, f));
-                }
-            );
-        }
-    };
-
-    //! Every `Iterable` instance gives rise to an instance of `Foldable`,
-    //! which is valid for all finite such `Iterable`s.
-    //!
-    //! @details
-    //! Let `xs` be an `Iterable` and let `xi` denote its `i`-th element. In
-    //! other words, `xs` can be folded into a list containing `[x1, ..., xN]`,
-    //! where `N` is the number of elements. Right-folding `xs` with a binary
-    //! operation `*` (in infix notation for legibility) is equivalent to
-    //! @code
-    //!     x1 * (x2 * ( ... * (xN-1 * xN)))
-    //! @endcode
-    //!
-    //! Similarly, left-folding `xs` is equivalent to
-    //! @code
-    //!     (((x1 * x2) * x3) * ...) * xN
-    //! @endcode
-    //!
-    //! In both cases, notice the side of the parentheses. Left-folding
-    //! applies `*` in a left-associative manner, whereas right-folding
-    //! applies it in a right-associative manner. For associative operations,
-    //! i.e. operations such that for all `a`, `b` and `c`,
-    //! @code
-    //!     (a * b) * c = a * (b * c)
-    //! @endcode
-    //! this makes no difference. Also note that lazy folds and folds with an
-    //! initial state are implemented in an analogous way.
-    //!
-    //! ### Example 1
-    //! @snippet example/list/foldable.cpp foldl
-    //!
-    //! ### Example 2
-    //! @snippet example/integer_list/foldable.cpp foldr
-    template <typename T>
-    struct Foldable::instance<T, when<is_an<Iterable, T>()>>
-        : Foldable::iterable_mcd
-    { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_FOLDABLE_ITERABLE_MCD_HPP
diff --git a/include/boost/hana/foldable/product_mcd.hpp b/include/boost/hana/foldable/product_mcd.hpp
deleted file mode 100644
index 0756b58bc..000000000
--- a/include/boost/hana/foldable/product_mcd.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Foldable::product_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_FOLDABLE_PRODUCT_MCD_HPP
-#define BOOST_HANA_FOLDABLE_PRODUCT_MCD_HPP
-
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/foldable/unpack_mcd.hpp>
-#include <boost/hana/product/product.hpp>
-
-
-namespace boost { namespace hana {
-    struct Foldable::product_mcd : Foldable::unpack_mcd {
-        template <typename P, typename F>
-        static constexpr decltype(auto) unpack_impl(P&& p, F&& f) {
-            return detail::std::forward<F>(f)(
-                first(detail::std::forward<P>(p)),
-                second(detail::std::forward<P>(p))
-            );
-        }
-    };
-
-    //! Minimal complete definition of `Foldable` for `Product`s.
-    //!
-    //! Folding a `Product` `p` is equivalent to folding a list containing
-    //! `first(p)` and `second(p)`, in that order.
-    template <typename P>
-    struct Foldable::instance<P, when<is_a<Product, P>()>>
-        : Foldable::product_mcd
-    { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_FOLDABLE_PRODUCT_MCD_HPP
diff --git a/include/boost/hana/foldable/record_mcd.hpp b/include/boost/hana/foldable/record_mcd.hpp
deleted file mode 100644
index a1f15c87f..000000000
--- a/include/boost/hana/foldable/record_mcd.hpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Foldable::record_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_FOLDABLE_RECORD_MCD_HPP
-#define BOOST_HANA_FOLDABLE_RECORD_MCD_HPP
-
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/foldable/folds_mcd.hpp>
-#include <boost/hana/product/product.hpp>
-#include <boost/hana/record/record.hpp>
-
-
-namespace boost { namespace hana {
-    template <typename R>
-    struct Foldable::record_mcd : Foldable::folds_mcd {
-        template <typename Udt, typename S, typename F>
-        static constexpr decltype(auto) foldl_impl(Udt&& udt, S&& s, F&& f) {
-            return foldl(members<R>, detail::std::forward<S>(s),
-                [&udt, f(detail::std::forward<F>(f))]
-                (auto&& s, auto&& member) -> decltype(auto) {
-                    return f(
-                        detail::std::forward<decltype(s)>(s),
-                        second(detail::std::forward<decltype(member)>(member))(
-                            detail::std::forward<Udt>(udt)
-                        )
-                    );
-                }
-            );
-        }
-
-        template <typename Udt, typename S, typename F>
-        static constexpr decltype(auto) foldr_impl(Udt&& udt, S&& s, F&& f) {
-            return foldr(members<R>, detail::std::forward<S>(s),
-                [&udt, f(detail::std::forward<F>(f))]
-                (auto&& member, auto&& s) -> decltype(auto) {
-                    return f(
-                        second(detail::std::forward<decltype(member)>(member))(
-                            detail::std::forward<Udt>(udt)
-                        ),
-                        detail::std::forward<decltype(s)>(s)
-                    );
-                }
-            );
-        }
-    };
-
-    //! Folding a `Record` `R` is equivalent to folding a list of its members,
-    //! in the same order as they appear in `members<R>`.
-    template <typename R>
-    struct Foldable::instance<R, when<is_a<Record, R>()>>
-        : Foldable::record_mcd<R>
-    { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_FOLDABLE_RECORD_MCD_HPP
diff --git a/include/boost/hana/foldable/unpack_mcd.hpp b/include/boost/hana/foldable/unpack_mcd.hpp
deleted file mode 100644
index b7d5b314a..000000000
--- a/include/boost/hana/foldable/unpack_mcd.hpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Foldable::unpack_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_FOLDABLE_UNPACK_MCD_HPP
-#define BOOST_HANA_FOLDABLE_UNPACK_MCD_HPP
-
-#include <boost/hana/foldable/foldable.hpp>
-
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/detail/variadic/foldl.hpp>
-#include <boost/hana/detail/variadic/foldl1.hpp>
-#include <boost/hana/detail/variadic/foldr.hpp>
-#include <boost/hana/detail/variadic/foldr1.hpp>
-#include <boost/hana/detail/variadic/for_each.hpp>
-#include <boost/hana/foldable/folds_mcd.hpp>
-#include <boost/hana/integral.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition: `unpack`
-    //!
-    //! @bug
-    //! The functions in this class do not perfectly forward their captures
-    //! when it would be possible to do so, because the language does not make
-    //! it possible.
-    struct Foldable::unpack_mcd : Foldable::folds_mcd {
-        template <typename Xs, typename S, typename F>
-        static constexpr decltype(auto) foldl_impl(Xs&& xs, S&& s, F&& f) {
-            return unpack(detail::std::forward<Xs>(xs),
-                [s(detail::std::forward<S>(s)), f(detail::std::forward<F>(f))]
-                (auto&& ...xs) -> decltype(auto) {
-                    return detail::variadic::foldl(f, s,
-                        detail::std::forward<decltype(xs)>(xs)...
-                    );
-                }
-            );
-        }
-
-        template <typename Xs, typename F>
-        static constexpr decltype(auto) foldl1_impl(Xs&& xs, F&& f) {
-            return unpack(detail::std::forward<Xs>(xs),
-                [f(detail::std::forward<F>(f))](auto&& ...xs) -> decltype(auto) {
-                    return detail::variadic::foldl1(f,
-                        detail::std::forward<decltype(xs)>(xs)...
-                    );
-                }
-            );
-        }
-
-        template <typename Xs, typename S, typename F>
-        static constexpr decltype(auto) foldr_impl(Xs&& xs, S&& s, F&& f) {
-            return unpack(detail::std::forward<Xs>(xs),
-                [s(detail::std::forward<S>(s)), f(detail::std::forward<F>(f))]
-                (auto&& ...xs) -> decltype(auto) {
-                    return detail::variadic::foldr(f, s,
-                        detail::std::forward<decltype(xs)>(xs)...
-                    );
-                }
-            );
-        }
-
-        template <typename Xs, typename F>
-        static constexpr decltype(auto) foldr1_impl(Xs&& xs, F&& f) {
-            return unpack(detail::std::forward<Xs>(xs),
-                [f(detail::std::forward<F>(f))](auto&& ...xs) -> decltype(auto) {
-                    return detail::variadic::foldr1(f,
-                        detail::std::forward<decltype(xs)>(xs)...
-                    );
-                }
-            );
-        }
-
-        template <typename Xs, typename F>
-        static constexpr decltype(auto) for_each_impl(Xs&& xs, F&& f) {
-            return unpack(detail::std::forward<Xs>(xs),
-                [f(detail::std::forward<F>(f))](auto&& ...xs) -> decltype(auto) {
-                    return detail::variadic::for_each(f,
-                        detail::std::forward<decltype(xs)>(xs)...
-                    );
-                }
-            );
-        }
-
-        template <typename Xs>
-        static constexpr decltype(auto) length_impl(Xs&& xs) {
-            return unpack(detail::std::forward<Xs>(xs), [](auto const& ...xs) {
-                return size_t<sizeof...(xs)>;
-            });
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_FOLDABLE_UNPACK_MCD_HPP
diff --git a/include/boost/hana/foreign.hpp b/include/boost/hana/foreign.hpp
index b86ae13bf..5dc212000 100644
--- a/include/boost/hana/foreign.hpp
+++ b/include/boost/hana/foreign.hpp
@@ -10,17 +10,228 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_FOREIGN_HPP
 #define BOOST_HANA_FOREIGN_HPP
 
-// Instances
-#include <boost/hana/foreign/comparable.hpp>
-#include <boost/hana/foreign/orderable.hpp>
-#include <boost/hana/foreign/logical.hpp>
-#include <boost/hana/foreign/enumerable.hpp>
+#include <boost/hana/core/is_a.hpp>
+#include <boost/hana/core/when.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+#include <boost/hana/detail/std/integer_sequence.hpp>
+#include <boost/hana/detail/std/size_t.hpp>
+#include <boost/hana/functional/id.hpp>
+#include <boost/hana/orderable.hpp>
 
-#include <boost/hana/foreign/monoid.hpp>
-#include <boost/hana/foreign/group.hpp>
-#include <boost/hana/foreign/ring.hpp>
-#include <boost/hana/foreign/integral_domain.hpp>
+// instances
+#include <boost/hana/comparable.hpp>
+#include <boost/hana/enumerable.hpp>
+#include <boost/hana/foldable.hpp>
+#include <boost/hana/group.hpp>
+#include <boost/hana/integral_domain.hpp>
+#include <boost/hana/logical.hpp>
+#include <boost/hana/monoid.hpp>
+#include <boost/hana/orderable.hpp>
+#include <boost/hana/ring.hpp>
 
-#include <boost/hana/foreign/foldable.hpp>
+
+namespace boost { namespace hana {
+    //! Instance of `Comparable` for objects of foreign types.
+    //!
+    //! Any two foreign objects whose types can be compared using
+    //! `operator==` are automatically instances of `Comparable` by
+    //! using that comparison.
+    template <typename T, typename U>
+    struct Comparable::instance<T, U,
+        when<is_valid<decltype((void)(*(T*)0 == *(U*)0))>>
+    >
+        : Comparable::equal_mcd
+    {
+        template <typename X, typename Y>
+        static constexpr decltype(auto) equal_impl(X&& x, Y&& y) {
+            return detail::std::forward<X>(x) == detail::std::forward<Y>(y);
+        }
+    };
+
+    //! Instance of `Enumerable` for objects of foreign numeric types.
+    //!
+    //! Any foreign object that can be incremented using `operator++` and
+    //! decremented using `operator--` is `Enumerable` using those operations
+    //! for `succ` and `pred` respectively.
+    template <typename T>
+    struct Enumerable::instance<T, when<is_valid<
+        decltype((void)(++*(T*)0)),
+        decltype((void)(--*(T*)0))
+    >>>
+        : Enumerable::mcd
+    {
+        template <typename X>
+        static constexpr decltype(auto) succ_impl(X /* by value */ x) {
+            return ++x;
+        }
+
+        template <typename X>
+        static constexpr decltype(auto) pred_impl(X /* by value */ x) {
+            return --x;
+        }
+    };
+
+    //! Instance of `Foldable` for array types.
+    //!
+    //! Builtin arrays whose size is known can be folded as-if they were
+    //! homogeneous tuples.
+    //!
+    //! @note
+    //! Builtin arrays can't be made more than `Foldable` (e.g. `Iterable`)
+    //! because they can't be empty and they also can't be returned from
+    //! functions.
+    template <typename T, detail::std::size_t N>
+    struct Foldable::instance<T[N]>
+        : Foldable::unpack_mcd
+    {
+        template <typename Xs, typename F, detail::std::size_t ...i>
+        static constexpr decltype(auto)
+        unpack_helper(Xs&& xs, F&& f, detail::std::index_sequence<i...>) {
+            return detail::std::forward<F>(f)(
+                detail::std::forward<T>(xs[i])...
+            );
+        }
+
+        template <typename Xs, typename F>
+        static constexpr decltype(auto) unpack_impl(Xs&& xs, F&& f) {
+            return unpack_helper(
+                detail::std::forward<Xs>(xs),
+                detail::std::forward<F>(f),
+                detail::std::make_index_sequence<N>{}
+            );
+        }
+    };
+
+    //! Instance of `Group` for objects of foreign numeric types.
+    //!
+    //! Any two foreign objects forming a `Monoid` and that can be
+    //! subtracted with the usual `operator-` naturally form an additive
+    //! group, with the group subtraction being that usual `operator-`.
+    template <typename T, typename U>
+    struct Group::instance<T, U, when<
+        are<Monoid, T, U>() &&
+        is_valid<decltype((void)(*(T*)0 - *(U*)0))>
+    >>
+        : Group::minus_mcd<T, U>
+    {
+        template <typename X, typename Y>
+        static constexpr decltype(auto) minus_impl(X&& x, Y&& y) {
+            return detail::std::forward<X>(x) - detail::std::forward<Y>(y);
+        }
+    };
+
+    //! Instance of `IntegralDomain` for objects of foreign numeric types.
+    //!
+    //! Any two foreign objects that are `Rings`s, that can be divided
+    //! and moded with the usual operators (`/` and `%`) naturally form
+    //! an integral domain with those operations.
+    template <typename T, typename U>
+    struct IntegralDomain::instance<T, U, when<
+        are<Ring, T, U>() &&
+        is_valid<decltype((void)(
+            *(T*)1 % *(U*)1,
+            *(T*)1 / *(U*)1
+        ))>
+    >> : IntegralDomain::mcd {
+        template <typename X, typename Y>
+        static constexpr decltype(auto) quot_impl(X&& x, Y&& y) {
+            return detail::std::forward<X>(x) / detail::std::forward<Y>(y);
+        }
+
+        template <typename X, typename Y>
+        static constexpr decltype(auto) mod_impl(X&& x, Y&& y) {
+            return detail::std::forward<X>(x) % detail::std::forward<Y>(y);
+        }
+    };
+
+    //! Instance of `Logical` for objects of foreign types that can be
+    //! implicitly converted to `bool`.
+    //!
+    //! Any foreign object that can be converted to `bool` implicitly is an
+    //! instance of `Logical` by converting that object to `bool` and then
+    //! using the obvious instance for `bool`.
+    //!
+    //! @bug
+    //! We can't use perfect forwarding because of this bug:
+    //! http://llvm.org/bugs/show_bug.cgi?id=20619
+    template <typename L>
+    struct Logical::instance<L,
+        when<is_valid<decltype(*(L*)0 ? (void)0 : (void)0)>>
+    >
+        : Logical::mcd
+    {
+
+        template <typename T, typename E>
+        static constexpr auto eval_if_impl(bool cond, T t, E e) {
+            return cond ? t(id) : e(id);
+        }
+
+        static constexpr auto not_impl(bool cond)
+        { return !cond; }
+    };
+
+    //! Instance of `Monoid` for foreign objects with numeric types.
+    //!
+    //! Any two foreign objects that can be added with the usual `operator+`
+    //! and for which a valid conversion from `int` exists (for both)
+    //! naturally form an additive `Monoid`, with `0` being the identity
+    //! and the usual `operator+` being the associative operation.
+    template <typename T, typename U>
+    struct Monoid::instance<T, U, when<is_valid<decltype((void)(
+        static_cast<T>(0),
+        static_cast<U>(0),
+        *(T*)0 + *(U*)0
+    ))>>> : Monoid::mcd {
+        template <typename X, typename Y>
+        static constexpr decltype(auto) plus_impl(X&& x, Y&& y) {
+            return detail::std::forward<X>(x) + detail::std::forward<Y>(y);
+        }
+
+        // Will never be used with two different `T` and `U` anyway.
+        static constexpr decltype(auto) zero_impl()
+        { return static_cast<T>(0); }
+    };
+
+    //! Instance of `Orderable` for foreign but `LessThanComparable` objects.
+    //!
+    //! Any two foreign objects whose types can be compared using `operator<`
+    //! are automatically instances of `Orderable` by using that comparison.
+    template <typename T, typename U>
+    struct Orderable::instance<T, U,
+        when<is_valid<decltype((void)(*(T*)0 < *(U*)0))>>
+    >
+        : Orderable::less_mcd
+    {
+        template <typename X, typename Y>
+        static constexpr decltype(auto) less_impl(X&& x, Y&& y) {
+            return detail::std::forward<X>(x) < detail::std::forward<Y>(y);
+        }
+    };
+
+    //! Instance of `Ring` for foreign objects with numeric types.
+    //!
+    //! Any two foreign objects that are `Group`s, that can be multiplied
+    //! with the usual `operator*` and for which a valid conversion from `int`
+    //! exists (for both) naturally form a multiplicative `Ring`, with `1`
+    //! being the identity and the usual `operator*` being the ring operation.
+    template <typename T, typename U>
+    struct Ring::instance<T, U, when<
+        are<Group, T, U>() &&
+        is_valid<decltype((void)(
+            static_cast<T>(1),
+            static_cast<U>(1),
+            *(T*)1 * *(U*)1
+        ))>
+    >> : Ring::mcd {
+        template <typename X, typename Y>
+        static constexpr decltype(auto) mult_impl(X&& x, Y&& y) {
+            return detail::std::forward<X>(x) * detail::std::forward<Y>(y);
+        }
+
+        // Will never be used with two different `T` and `U` anyway.
+        static constexpr auto one_impl()
+        { return static_cast<T>(1); }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_FOREIGN_HPP
diff --git a/include/boost/hana/foreign/comparable.hpp b/include/boost/hana/foreign/comparable.hpp
deleted file mode 100644
index a33446f46..000000000
--- a/include/boost/hana/foreign/comparable.hpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Comparable` for foreign types.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_FOREIGN_COMPARABLE_HPP
-#define BOOST_HANA_FOREIGN_COMPARABLE_HPP
-
-#include <boost/hana/comparable/equal_mcd.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Comparable` for objects of foreign types.
-    //!
-    //! Any two foreign objects whose types can be compared using
-    //! `operator==` are automatically instances of `Comparable` by
-    //! using that comparison.
-    template <typename T, typename U>
-    struct Comparable::instance<T, U,
-        when<is_valid<decltype((void)(*(T*)0 == *(U*)0))>>
-    >
-        : Comparable::equal_mcd
-    {
-        template <typename X, typename Y>
-        static constexpr decltype(auto) equal_impl(X&& x, Y&& y) {
-            return detail::std::forward<X>(x) == detail::std::forward<Y>(y);
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_FOREIGN_COMPARABLE_HPP
diff --git a/include/boost/hana/foreign/enumerable.hpp b/include/boost/hana/foreign/enumerable.hpp
deleted file mode 100644
index 3dd65cdaf..000000000
--- a/include/boost/hana/foreign/enumerable.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Enumerable` for foreign types.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_FOREIGN_ENUMERABLE_HPP
-#define BOOST_HANA_FOREIGN_ENUMERABLE_HPP
-
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/enumerable/mcd.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Enumerable` for objects of foreign numeric types.
-    //!
-    //! Any foreign object that can be incremented using `operator++` and
-    //! decremented using `operator--` is `Enumerable` using those operations
-    //! for `succ` and `pred` respectively.
-    template <typename T>
-    struct Enumerable::instance<T, when<is_valid<
-        decltype((void)(++*(T*)0)),
-        decltype((void)(--*(T*)0))
-    >>>
-        : Enumerable::mcd
-    {
-        template <typename X>
-        static constexpr decltype(auto) succ_impl(X /* by value */ x) {
-            return ++x;
-        }
-
-        template <typename X>
-        static constexpr decltype(auto) pred_impl(X /* by value */ x) {
-            return --x;
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_FOREIGN_ENUMERABLE_HPP
diff --git a/include/boost/hana/foreign/foldable.hpp b/include/boost/hana/foreign/foldable.hpp
deleted file mode 100644
index 50f53a3d0..000000000
--- a/include/boost/hana/foreign/foldable.hpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Foldable` for foreign types.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_FOREIGN_FOLDABLE_HPP
-#define BOOST_HANA_FOREIGN_FOLDABLE_HPP
-
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/detail/std/integer_sequence.hpp>
-#include <boost/hana/detail/std/size_t.hpp>
-#include <boost/hana/foldable/unpack_mcd.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Foldable` for array types.
-    //!
-    //! Builtin arrays whose size is known can be folded as-if they were
-    //! homogeneous tuples.
-    //!
-    //! @note
-    //! Builtin arrays can't be made more than `Foldable` (e.g. `Iterable`)
-    //! because they can't be empty and they also can't be returned from
-    //! functions.
-    template <typename T, detail::std::size_t N>
-    struct Foldable::instance<T[N]>
-        : Foldable::unpack_mcd
-    {
-        template <typename Xs, typename F, detail::std::size_t ...i>
-        static constexpr decltype(auto)
-        unpack_helper(Xs&& xs, F&& f, detail::std::index_sequence<i...>) {
-            return detail::std::forward<F>(f)(
-                detail::std::forward<T>(xs[i])...
-            );
-        }
-
-        template <typename Xs, typename F>
-        static constexpr decltype(auto) unpack_impl(Xs&& xs, F&& f) {
-            return unpack_helper(
-                detail::std::forward<Xs>(xs),
-                detail::std::forward<F>(f),
-                detail::std::make_index_sequence<N>{}
-            );
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_FOREIGN_FOLDABLE_HPP
diff --git a/include/boost/hana/foreign/group.hpp b/include/boost/hana/foreign/group.hpp
deleted file mode 100644
index d92614c52..000000000
--- a/include/boost/hana/foreign/group.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Group` for foreign types.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_FOREIGN_GROUP_HPP
-#define BOOST_HANA_FOREIGN_GROUP_HPP
-
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/group/minus_mcd.hpp>
-
-// Mcd
-#include <boost/hana/foreign/monoid.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Group` for objects of foreign numeric types.
-    //!
-    //! Any two foreign objects forming a `Monoid` and that can be
-    //! subtracted with the usual `operator-` naturally form an additive
-    //! group, with the group subtraction being that usual `operator-`.
-    template <typename T, typename U>
-    struct Group::instance<T, U, when<
-        are<Monoid, T, U>() &&
-        is_valid<decltype((void)(*(T*)0 - *(U*)0))>
-    >>
-        : Group::minus_mcd<T, U>
-    {
-        template <typename X, typename Y>
-        static constexpr decltype(auto) minus_impl(X&& x, Y&& y) {
-            return detail::std::forward<X>(x) - detail::std::forward<Y>(y);
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_FOREIGN_GROUP_HPP
diff --git a/include/boost/hana/foreign/integral_domain.hpp b/include/boost/hana/foreign/integral_domain.hpp
deleted file mode 100644
index 9dcc4ec97..000000000
--- a/include/boost/hana/foreign/integral_domain.hpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::IntegralDomain` for foreign types.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_FOREIGN_INTEGRAL_DOMAIN_HPP
-#define BOOST_HANA_FOREIGN_INTEGRAL_DOMAIN_HPP
-
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/integral_domain/mcd.hpp>
-
-// Mcd
-#include <boost/hana/foreign/ring.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `IntegralDomain` for objects of foreign numeric types.
-    //!
-    //! Any two foreign objects that are `Rings`s, that can be divided
-    //! and moded with the usual operators (`/` and `%`) naturally form
-    //! an integral domain with those operations.
-    template <typename T, typename U>
-    struct IntegralDomain::instance<T, U, when<
-        are<Ring, T, U>() &&
-        is_valid<decltype((void)(
-            *(T*)1 % *(U*)1,
-            *(T*)1 / *(U*)1
-        ))>
-    >> : IntegralDomain::mcd {
-        template <typename X, typename Y>
-        static constexpr decltype(auto) quot_impl(X&& x, Y&& y) {
-            return detail::std::forward<X>(x) / detail::std::forward<Y>(y);
-        }
-
-        template <typename X, typename Y>
-        static constexpr decltype(auto) mod_impl(X&& x, Y&& y) {
-            return detail::std::forward<X>(x) % detail::std::forward<Y>(y);
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_FOREIGN_INTEGRAL_DOMAIN_HPP
diff --git a/include/boost/hana/foreign/logical.hpp b/include/boost/hana/foreign/logical.hpp
deleted file mode 100644
index 48bc50f46..000000000
--- a/include/boost/hana/foreign/logical.hpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Logical` for foreign types.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_FOREIGN_LOGICAL_HPP
-#define BOOST_HANA_FOREIGN_LOGICAL_HPP
-
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/functional/id.hpp>
-#include <boost/hana/logical/mcd.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Logical` for objects of foreign types that can be
-    //! implicitly converted to `bool`.
-    //!
-    //! Any foreign object that can be converted to `bool` implicitly is an
-    //! instance of `Logical` by converting that object to `bool` and then
-    //! using the obvious instance for `bool`.
-    //!
-    //! @bug
-    //! We can't use perfect forwarding because of this bug:
-    //! http://llvm.org/bugs/show_bug.cgi?id=20619
-    template <typename L>
-    struct Logical::instance<L,
-        when<is_valid<decltype(*(L*)0 ? (void)0 : (void)0)>>
-    >
-        : Logical::mcd
-    {
-
-        template <typename T, typename E>
-        static constexpr auto eval_if_impl(bool cond, T t, E e) {
-            return cond ? t(id) : e(id);
-        }
-
-        static constexpr auto not_impl(bool cond)
-        { return !cond; }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_FOREIGN_LOGICAL_HPP
diff --git a/include/boost/hana/foreign/monoid.hpp b/include/boost/hana/foreign/monoid.hpp
deleted file mode 100644
index c94091c5a..000000000
--- a/include/boost/hana/foreign/monoid.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Monoid` for foreign types.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_FOREIGN_MONOID_HPP
-#define BOOST_HANA_FOREIGN_MONOID_HPP
-
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/monoid/mcd.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Monoid` for foreign objects with numeric types.
-    //!
-    //! Any two foreign objects that can be added with the usual `operator+`
-    //! and for which a valid conversion from `int` exists (for both)
-    //! naturally form an additive `Monoid`, with `0` being the identity
-    //! and the usual `operator+` being the associative operation.
-    template <typename T, typename U>
-    struct Monoid::instance<T, U, when<is_valid<decltype((void)(
-        static_cast<T>(0),
-        static_cast<U>(0),
-        *(T*)0 + *(U*)0
-    ))>>> : Monoid::mcd {
-        template <typename X, typename Y>
-        static constexpr decltype(auto) plus_impl(X&& x, Y&& y) {
-            return detail::std::forward<X>(x) + detail::std::forward<Y>(y);
-        }
-
-        // Will never be used with two different `T` and `U` anyway.
-        static constexpr decltype(auto) zero_impl()
-        { return static_cast<T>(0); }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_FOREIGN_MONOID_HPP
diff --git a/include/boost/hana/foreign/orderable.hpp b/include/boost/hana/foreign/orderable.hpp
deleted file mode 100644
index 2d013fc16..000000000
--- a/include/boost/hana/foreign/orderable.hpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Orderable` for foreign types.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_FOREIGN_ORDERABLE_HPP
-#define BOOST_HANA_FOREIGN_ORDERABLE_HPP
-
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/orderable/less_mcd.hpp>
-#include <boost/hana/orderable/orderable.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Orderable` for foreign but `LessThanComparable` objects.
-    //!
-    //! Any two foreign objects whose types can be compared using `operator<`
-    //! are automatically instances of `Orderable` by using that comparison.
-    template <typename T, typename U>
-    struct Orderable::instance<T, U,
-        when<is_valid<decltype((void)(*(T*)0 < *(U*)0))>>
-    >
-        : Orderable::less_mcd
-    {
-        template <typename X, typename Y>
-        static constexpr decltype(auto) less_impl(X&& x, Y&& y) {
-            return detail::std::forward<X>(x) < detail::std::forward<Y>(y);
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_FOREIGN_ORDERABLE_HPP
diff --git a/include/boost/hana/foreign/ring.hpp b/include/boost/hana/foreign/ring.hpp
deleted file mode 100644
index de63066bf..000000000
--- a/include/boost/hana/foreign/ring.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Ring` for foreign types.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_FOREIGN_RING_HPP
-#define BOOST_HANA_FOREIGN_RING_HPP
-
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/ring/mcd.hpp>
-
-// Mcd
-#include <boost/hana/foreign/group.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Ring` for foreign objects with numeric types.
-    //!
-    //! Any two foreign objects that are `Group`s, that can be multiplied
-    //! with the usual `operator*` and for which a valid conversion from `int`
-    //! exists (for both) naturally form a multiplicative `Ring`, with `1`
-    //! being the identity and the usual `operator*` being the ring operation.
-    template <typename T, typename U>
-    struct Ring::instance<T, U, when<
-        are<Group, T, U>() &&
-        is_valid<decltype((void)(
-            static_cast<T>(1),
-            static_cast<U>(1),
-            *(T*)1 * *(U*)1
-        ))>
-    >> : Ring::mcd {
-        template <typename X, typename Y>
-        static constexpr decltype(auto) mult_impl(X&& x, Y&& y) {
-            return detail::std::forward<X>(x) * detail::std::forward<Y>(y);
-        }
-
-        // Will never be used with two different `T` and `U` anyway.
-        static constexpr auto one_impl()
-        { return static_cast<T>(1); }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_FOREIGN_RING_HPP
diff --git a/include/boost/hana/functor.hpp b/include/boost/hana/functor.hpp
index 720fc5073..257092131 100644
--- a/include/boost/hana/functor.hpp
+++ b/include/boost/hana/functor.hpp
@@ -10,9 +10,39 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_FUNCTOR_HPP
 #define BOOST_HANA_FUNCTOR_HPP
 
-#include <boost/hana/functor/adjust_mcd.hpp>
-#include <boost/hana/functor/fmap_mcd.hpp>
-#include <boost/hana/functor/functor.hpp>
-#include <boost/hana/functor/list_mcd.hpp>
+#include <boost/hana/fwd/functor.hpp>
+
+#include <boost/hana/bool.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+#include <boost/hana/logical.hpp>
+
+
+namespace boost { namespace hana {
+    //! Minimal complete definition: `fmap`
+    struct Functor::fmap_mcd : functor_detail::common {
+        template <typename Xs, typename Pred, typename F>
+        static constexpr auto adjust_impl(Xs xs, Pred pred, F f) {
+            auto go = [=](auto x) {
+                return eval_if(pred(x),
+                    [=](auto _) { return _(f)(x); },
+                    [=](auto) { return x; }
+                );
+            };
+            return fmap(xs, go);
+        }
+    };
+
+    //! Minimal complete definition: `adjust`
+    struct Functor::adjust_mcd : functor_detail::common {
+        template <typename Xs, typename F>
+        static constexpr decltype(auto) fmap_impl(Xs&& xs, F&& f) {
+            return adjust(
+                detail::std::forward<Xs>(xs),
+                [](auto) { return true_; },
+                detail::std::forward<F>(f)
+            );
+        }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_FUNCTOR_HPP
diff --git a/include/boost/hana/functor/adjust_mcd.hpp b/include/boost/hana/functor/adjust_mcd.hpp
deleted file mode 100644
index 5cee96bfd..000000000
--- a/include/boost/hana/functor/adjust_mcd.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Functor::adjust_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_FUNCTOR_ADJUST_MCD_HPP
-#define BOOST_HANA_FUNCTOR_ADJUST_MCD_HPP
-
-#include <boost/hana/functor/functor.hpp>
-
-#include <boost/hana/bool.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition: `adjust`
-    struct Functor::adjust_mcd : functor_detail::common {
-        template <typename Xs, typename F>
-        static constexpr decltype(auto) fmap_impl(Xs&& xs, F&& f) {
-            return adjust(
-                detail::std::forward<Xs>(xs),
-                [](auto) { return true_; },
-                detail::std::forward<F>(f)
-            );
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_FUNCTOR_ADJUST_MCD_HPP
diff --git a/include/boost/hana/functor/fmap_mcd.hpp b/include/boost/hana/functor/fmap_mcd.hpp
deleted file mode 100644
index 3d9c42364..000000000
--- a/include/boost/hana/functor/fmap_mcd.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Functor::fmap_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_FUNCTOR_FMAP_MCD_HPP
-#define BOOST_HANA_FUNCTOR_FMAP_MCD_HPP
-
-#include <boost/hana/functor/functor.hpp>
-
-#include <boost/hana/logical/logical.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition: `fmap`
-    struct Functor::fmap_mcd : functor_detail::common {
-        template <typename Xs, typename Pred, typename F>
-        static constexpr auto adjust_impl(Xs xs, Pred pred, F f) {
-            auto go = [=](auto x) {
-                return eval_if(pred(x),
-                    [=](auto _) { return _(f)(x); },
-                    [=](auto) { return x; }
-                );
-            };
-            return fmap(xs, go);
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_FUNCTOR_FMAP_MCD_HPP
diff --git a/include/boost/hana/functor/list_mcd.hpp b/include/boost/hana/functor/list_mcd.hpp
deleted file mode 100644
index ea514abab..000000000
--- a/include/boost/hana/functor/list_mcd.hpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Functor::list_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_FUNCTOR_LIST_MCD_HPP
-#define BOOST_HANA_FUNCTOR_LIST_MCD_HPP
-
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/foldable/foldable.hpp>
-#include <boost/hana/functor/fmap_mcd.hpp>
-#include <boost/hana/list/list.hpp>
-
-
-namespace boost { namespace hana {
-    template <typename T>
-    struct Functor::list_mcd : Functor::fmap_mcd {
-        template <typename Xs, typename F>
-        static constexpr auto fmap_impl(Xs xs, F f) {
-            return foldr(xs, nil<T>, [=](auto x, auto xs) {
-                return cons(f(x), xs);
-            });
-        }
-    };
-
-    //! `Functor` instance for `List`s.
-    //!
-    //! `List`s implement `fmap` as the mapping of a function over each
-    //! element of the list, which is somewhat equivalent to `std::transform`.
-    //! Mapping a function over an empty list returns an empty list and never
-    //! applies the function.
-    //!
-    //! ### Example
-    //! @snippet example/list/functor.cpp fmap
-    template <typename T>
-    struct Functor::instance<T, when<is_a<List, T>()>>
-        : Functor::list_mcd<T>
-    { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_FUNCTOR_LIST_MCD_HPP
diff --git a/include/boost/hana/applicative/applicative.hpp b/include/boost/hana/fwd/applicative.hpp
similarity index 96%
rename from include/boost/hana/applicative/applicative.hpp
rename to include/boost/hana/fwd/applicative.hpp
index b6a9c840c..46d175fb5 100644
--- a/include/boost/hana/applicative/applicative.hpp
+++ b/include/boost/hana/fwd/applicative.hpp
@@ -7,15 +7,15 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_APPLICATIVE_APPLICATIVE_HPP
-#define BOOST_HANA_APPLICATIVE_APPLICATIVE_HPP
+#ifndef BOOST_HANA_FWD_APPLICATIVE_HPP
+#define BOOST_HANA_FWD_APPLICATIVE_HPP
 
 #include <boost/hana/core/datatype.hpp>
 #include <boost/hana/core/typeclass.hpp>
 #include <boost/hana/detail/std/forward.hpp>
 #include <boost/hana/detail/variadic/foldl.hpp>
 #include <boost/hana/functional/curry.hpp>
-#include <boost/hana/functor/functor.hpp>
+#include <boost/hana/fwd/functor.hpp>
 
 
 namespace boost { namespace hana {
@@ -154,4 +154,4 @@ namespace boost { namespace hana {
 #endif
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_APPLICATIVE_APPLICATIVE_HPP
+#endif // !BOOST_HANA_FWD_APPLICATIVE_HPP
diff --git a/include/boost/hana/bool/bool.hpp b/include/boost/hana/fwd/bool.hpp
similarity index 87%
rename from include/boost/hana/bool/bool.hpp
rename to include/boost/hana/fwd/bool.hpp
index 6c176fb87..42f23ebcb 100644
--- a/include/boost/hana/bool/bool.hpp
+++ b/include/boost/hana/fwd/bool.hpp
@@ -7,12 +7,12 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_BOOL_BOOL_HPP
-#define BOOST_HANA_BOOL_BOOL_HPP
+#ifndef BOOST_HANA_FWD_BOOL_HPP
+#define BOOST_HANA_FWD_BOOL_HPP
 
-#include <boost/hana/comparable/operators.hpp>
 #include <boost/hana/core/operators.hpp>
-#include <boost/hana/logical/operators.hpp>
+#include <boost/hana/fwd/comparable.hpp>
+#include <boost/hana/fwd/logical.hpp>
 
 
 namespace boost { namespace hana {
@@ -50,4 +50,4 @@ namespace boost { namespace hana {
     constexpr auto false_ = bool_<false>;
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_BOOL_BOOL_HPP
+#endif // !BOOST_HANA_FWD_BOOL_HPP
diff --git a/include/boost/hana/comparable/comparable.hpp b/include/boost/hana/fwd/comparable.hpp
similarity index 96%
rename from include/boost/hana/comparable/comparable.hpp
rename to include/boost/hana/fwd/comparable.hpp
index aee0d8ba9..337053e82 100644
--- a/include/boost/hana/comparable/comparable.hpp
+++ b/include/boost/hana/fwd/comparable.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_COMPARABLE_COMPARABLE_HPP
-#define BOOST_HANA_COMPARABLE_COMPARABLE_HPP
+#ifndef BOOST_HANA_FWD_COMPARABLE_HPP
+#define BOOST_HANA_FWD_COMPARABLE_HPP
 
 #include <boost/hana/core/datatype.hpp>
 #include <boost/hana/core/typeclass.hpp>
@@ -113,4 +113,4 @@ namespace boost { namespace hana {
     };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_COMPARABLE_COMPARABLE_HPP
+#endif // !BOOST_HANA_FWD_COMPARABLE_HPP
diff --git a/include/boost/hana/constant/constant.hpp b/include/boost/hana/fwd/constant.hpp
similarity index 95%
rename from include/boost/hana/constant/constant.hpp
rename to include/boost/hana/fwd/constant.hpp
index 3cb24f933..ef012e09a 100644
--- a/include/boost/hana/constant/constant.hpp
+++ b/include/boost/hana/fwd/constant.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_CONSTANT_CONSTANT_HPP
-#define BOOST_HANA_CONSTANT_CONSTANT_HPP
+#ifndef BOOST_HANA_FWD_CONSTANT_HPP
+#define BOOST_HANA_FWD_CONSTANT_HPP
 
 #include <boost/hana/core/datatype.hpp>
 #include <boost/hana/core/typeclass.hpp>
@@ -79,4 +79,4 @@ namespace boost { namespace hana {
 #endif
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_CONSTANT_CONSTANT_HPP
+#endif // !BOOST_HANA_FWD_CONSTANT_HPP
diff --git a/include/boost/hana/either/either.hpp b/include/boost/hana/fwd/either.hpp
similarity index 95%
rename from include/boost/hana/either/either.hpp
rename to include/boost/hana/fwd/either.hpp
index edb218a75..48d6fa762 100644
--- a/include/boost/hana/either/either.hpp
+++ b/include/boost/hana/fwd/either.hpp
@@ -7,15 +7,15 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_EITHER_EITHER_HPP
-#define BOOST_HANA_EITHER_EITHER_HPP
+#ifndef BOOST_HANA_FWD_EITHER_HPP
+#define BOOST_HANA_FWD_EITHER_HPP
 
-#include <boost/hana/comparable/operators.hpp>
 #include <boost/hana/core/operators.hpp>
 #include <boost/hana/detail/constexpr.hpp>
 #include <boost/hana/detail/std/forward.hpp>
 #include <boost/hana/detail/std/move.hpp>
-#include <boost/hana/monad/operators.hpp>
+#include <boost/hana/fwd/comparable.hpp>
+#include <boost/hana/fwd/monad.hpp>
 
 
 namespace boost { namespace hana {
@@ -146,4 +146,4 @@ namespace boost { namespace hana {
 #endif
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_EITHER_EITHER_HPP
+#endif // !BOOST_HANA_FWD_EITHER_HPP
diff --git a/include/boost/hana/enumerable/enumerable.hpp b/include/boost/hana/fwd/enumerable.hpp
similarity index 93%
rename from include/boost/hana/enumerable/enumerable.hpp
rename to include/boost/hana/fwd/enumerable.hpp
index 2a003cc1a..ce0fd5510 100644
--- a/include/boost/hana/enumerable/enumerable.hpp
+++ b/include/boost/hana/fwd/enumerable.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_ENUMERABLE_ENUMERABLE_HPP
-#define BOOST_HANA_ENUMERABLE_ENUMERABLE_HPP
+#ifndef BOOST_HANA_FWD_ENUMERABLE_HPP
+#define BOOST_HANA_FWD_ENUMERABLE_HPP
 
 #include <boost/hana/core/datatype.hpp>
 #include <boost/hana/core/typeclass.hpp>
@@ -60,4 +60,4 @@ namespace boost { namespace hana {
     };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_ENUMERABLE_ENUMERABLE_HPP
+#endif // !BOOST_HANA_FWD_ENUMERABLE_HPP
diff --git a/include/boost/hana/ext/boost/fusion/sequence/sequence.hpp b/include/boost/hana/fwd/ext/boost/fusion/sequence.hpp
similarity index 57%
rename from include/boost/hana/ext/boost/fusion/sequence/sequence.hpp
rename to include/boost/hana/fwd/ext/boost/fusion/sequence.hpp
index 62abc4739..cf82c4c69 100644
--- a/include/boost/hana/ext/boost/fusion/sequence/sequence.hpp
+++ b/include/boost/hana/fwd/ext/boost/fusion/sequence.hpp
@@ -1,14 +1,14 @@
 /*!
 @file
-Forward declares `boost::hana::BoostFusionSequence`.
+Forward declares `boost::hana::ext::boost::fusion::sequence`.
 
 @copyright Louis Dionne 2014
 Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_SEQUENCE_HPP
-#define BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_SEQUENCE_HPP
+#ifndef BOOST_HANA_FWD_EXT_BOOST_FUSION_SEQUENCE_HPP
+#define BOOST_HANA_FWD_EXT_BOOST_FUSION_SEQUENCE_HPP
 
 #include <boost/hana/core/datatype.hpp>
 #include <boost/hana/core/when.hpp>
@@ -20,28 +20,30 @@ Distributed under the Boost Software License, Version 1.0.
 
 namespace boost { namespace hana {
     namespace fusion_detail {
-        template <typename T, bool = boost::fusion::traits::is_sequence<T>::value>
+        template <typename T, bool = ::boost::fusion::traits::is_sequence<T>::value>
         struct is_nonassociative_forward_sequence {
             static constexpr bool value = false;
         };
 
         template <typename T>
         struct is_nonassociative_forward_sequence<T, true> {
-            static constexpr bool value = !std::is_base_of<
-                boost::fusion::associative_tag,
-                typename boost::fusion::traits::category_of<T>::type
+            static constexpr bool value = ! ::std::is_base_of<
+                ::boost::fusion::associative_tag,
+                typename ::boost::fusion::traits::category_of<T>::type
             >::value;
         };
     }
 
-    struct BoostFusionSequence;
+    namespace ext { namespace boost { namespace fusion {
+        struct sequence;
+    }}}
 
     template <typename T>
     struct datatype<T, when<
         fusion_detail::is_nonassociative_forward_sequence<T>::value
     >> {
-        using type = BoostFusionSequence;
+        using type = ext::boost::fusion::sequence;
     };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_EXT_BOOST_FUSION_SEQUENCE_SEQUENCE_HPP
+#endif // !BOOST_HANA_FWD_EXT_BOOST_FUSION_SEQUENCE_HPP
diff --git a/include/boost/hana/fwd/ext/boost/mpl/integral_c.hpp b/include/boost/hana/fwd/ext/boost/mpl/integral_c.hpp
new file mode 100644
index 000000000..e803447c1
--- /dev/null
+++ b/include/boost/hana/fwd/ext/boost/mpl/integral_c.hpp
@@ -0,0 +1,48 @@
+/*!
+@file
+Forward declares `boost::hana::ext::boost::mpl::IntegralC`.
+
+@copyright Louis Dionne 2014
+Distributed under the Boost Software License, Version 1.0.
+(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+ */
+
+#ifndef BOOST_HANA_FWD_EXT_BOOST_MPL_INTEGRAL_C_HPP
+#define BOOST_HANA_FWD_EXT_BOOST_MPL_INTEGRAL_C_HPP
+
+#include <boost/hana/core/datatype.hpp>
+#include <boost/hana/core/when.hpp>
+#include <boost/hana/detail/std/is_same.hpp>
+
+#include <boost/mpl/integral_c_tag.hpp>
+
+
+namespace boost { namespace hana {
+    namespace ext { namespace boost { namespace mpl {
+        //! @ingroup group-datatypes
+        //! Data type representing Boost.MPL IntegralConstants
+        //!
+        //! Note that while the documentation does not present it that way,
+        //! this type is the same as `boost::mpl::integral_c_tag`.
+        //!
+        //! ### Instance of
+        //! `Constant`, `IntegralConstant`
+#ifdef BOOST_HANA_DOXYGEN_INVOKED
+        struct IntegralC;
+#else
+        using IntegralC = ::boost::mpl::integral_c_tag;
+#endif
+    }}}
+
+    template <typename T>
+    struct datatype<T, when<
+        detail::std::is_same<
+            typename T::tag,
+            ::boost::mpl::integral_c_tag
+        >::value
+    >> {
+        using type = ext::boost::mpl::IntegralC;
+    };
+}} // end namespace boost::hana
+
+#endif // !BOOST_HANA_FWD_EXT_BOOST_MPL_INTEGRAL_C_HPP
diff --git a/include/boost/hana/fwd/ext/boost/mpl/vector.hpp b/include/boost/hana/fwd/ext/boost/mpl/vector.hpp
new file mode 100644
index 000000000..8158e4bb9
--- /dev/null
+++ b/include/boost/hana/fwd/ext/boost/mpl/vector.hpp
@@ -0,0 +1,65 @@
+/*!
+@file
+Forward declares `boost::hana::ext::boost::mpl::Vector`.
+
+@copyright Louis Dionne 2014
+Distributed under the Boost Software License, Version 1.0.
+(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+ */
+
+#ifndef BOOST_HANA_FWD_EXT_BOOST_MPL_VECTOR_HPP
+#define BOOST_HANA_FWD_EXT_BOOST_MPL_VECTOR_HPP
+
+#include <boost/hana/core/datatype.hpp>
+#include <boost/hana/detail/std/is_same.hpp>
+
+#include <boost/mpl/sequence_tag.hpp>
+#include <boost/mpl/vector.hpp>
+
+
+namespace boost { namespace hana {
+    namespace ext { namespace boost { namespace mpl {
+        //! @ingroup group-datatypes
+        //! Data type representing Boost.MPL vectors.
+        //!
+        //! Note that while the documentation does not present it that way,
+        //! this type is the same as
+        //! @code
+        //!     boost::mpl::sequence_tag<boost::mpl::vector<>>::type
+        //! @endcode
+        //!
+        //! ## Instance of
+        //! `Functor`, `Iterable`, `List` and `Comparable`
+        //!
+        //! ## MPL / Hana cheat sheet
+        //! This section presents correspondences between operations with the
+        //! Boost.MPL and operations with Boost.Hana. The organization follows
+        //! that of the Boost.MPL algorithms.
+        //!
+        //! ### Iteration algorithms
+        //! #### `fold`
+        //! @snippet example/ext/mpl/vector/cheatsheet/fold.cpp mpl
+        //! @snippet example/ext/mpl/vector/cheatsheet/fold.cpp hana
+        //!
+        //! @todo
+        //! - Finish the cheat sheet.
+        //! - Document instances.
+#ifdef BOOST_HANA_DOXYGEN_INVOKED
+        struct Vector;
+#else
+        using Vector = ::boost::mpl::sequence_tag< ::boost::mpl::vector<>>::type;
+#endif
+    }}}
+
+    template <typename T>
+    struct datatype<T, when<
+        detail::std::is_same<
+            typename ::boost::mpl::sequence_tag<T>::type,
+            ::boost::mpl::sequence_tag< ::boost::mpl::vector<>>::type
+        >::value
+    >> {
+        using type = ext::boost::mpl::Vector;
+    };
+}} // end namespace boost::hana
+
+#endif // !BOOST_HANA_FWD_EXT_BOOST_MPL_VECTOR_HPP
diff --git a/include/boost/hana/fwd/ext/boost/tuple.hpp b/include/boost/hana/fwd/ext/boost/tuple.hpp
new file mode 100644
index 000000000..63f8cc16b
--- /dev/null
+++ b/include/boost/hana/fwd/ext/boost/tuple.hpp
@@ -0,0 +1,37 @@
+/*!
+@file
+Forward declares `boost::hana::ext::boost::tuple`.
+
+@copyright Louis Dionne 2014
+Distributed under the Boost Software License, Version 1.0.
+(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+ */
+
+#ifndef BOOST_HANA_FWD_EXT_BOOST_TUPLE_HPP
+#define BOOST_HANA_FWD_EXT_BOOST_TUPLE_HPP
+
+#include <boost/hana/core/datatype.hpp>
+
+#include <boost/tuple/tuple.hpp>
+
+
+namespace boost { namespace hana {
+    namespace ext { namespace boost { struct tuple; }}
+
+    template <typename ...Xs>
+    struct datatype< ::boost::tuple<Xs...>> {
+        using type = ext::boost::tuple;
+    };
+
+    template <typename H, typename T>
+    struct datatype< ::boost::tuples::cons<H, T>> {
+        using type = ext::boost::tuple;
+    };
+
+    template <>
+    struct datatype< ::boost::tuples::null_type> {
+        using type = ext::boost::tuple;
+    };
+}} // end namespace boost::hana
+
+#endif // !BOOST_HANA_FWD_EXT_BOOST_TUPLE_HPP
diff --git a/include/boost/hana/ext/std/array/array.hpp b/include/boost/hana/fwd/ext/std/array.hpp
similarity index 55%
rename from include/boost/hana/ext/std/array/array.hpp
rename to include/boost/hana/fwd/ext/std/array.hpp
index b0ecaa04f..081872071 100644
--- a/include/boost/hana/ext/std/array/array.hpp
+++ b/include/boost/hana/fwd/ext/std/array.hpp
@@ -1,14 +1,14 @@
 /*!
 @file
-Forward declares `boost::hana::StdArray`.
+Forward declares `boost::hana::ext::std::Array`.
 
 @copyright Louis Dionne 2014
 Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_EXT_STD_ARRAY_ARRAY_HPP
-#define BOOST_HANA_EXT_STD_ARRAY_ARRAY_HPP
+#ifndef BOOST_HANA_FWD_EXT_STD_ARRAY_HPP
+#define BOOST_HANA_FWD_EXT_STD_ARRAY_HPP
 
 #include <boost/hana/core/datatype.hpp>
 
@@ -17,12 +17,12 @@ Distributed under the Boost Software License, Version 1.0.
 
 
 namespace boost { namespace hana {
-    struct StdArray { };
+    namespace ext { namespace std { struct Array; }}
 
     template <typename T, std::size_t N>
-    struct datatype<std::array<T, N>> {
-        using type = StdArray;
+    struct datatype< ::std::array<T, N>> {
+        using type = ext::std::Array;
     };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_EXT_STD_ARRAY_ARRAY_HPP
+#endif // !BOOST_HANA_FWD_EXT_STD_ARRAY_HPP
diff --git a/include/boost/hana/fwd/ext/std/integer_sequence.hpp b/include/boost/hana/fwd/ext/std/integer_sequence.hpp
new file mode 100644
index 000000000..f93bd8845
--- /dev/null
+++ b/include/boost/hana/fwd/ext/std/integer_sequence.hpp
@@ -0,0 +1,27 @@
+/*!
+@file
+Forward declares `boost::hana::ext::std::IntegerSequence`.
+
+@copyright Louis Dionne 2014
+Distributed under the Boost Software License, Version 1.0.
+(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+ */
+
+#ifndef BOOST_HANA_FWD_EXT_STD_INTEGER_SEQUENCE_HPP
+#define BOOST_HANA_FWD_EXT_STD_INTEGER_SEQUENCE_HPP
+
+#include <boost/hana/core/datatype.hpp>
+
+#include <utility>
+
+
+namespace boost { namespace hana {
+    namespace ext { namespace std { struct IntegerSequence; }}
+
+    template <typename T, T ...v>
+    struct datatype< ::std::integer_sequence<T, v...>> {
+        using type = ext::std::IntegerSequence;
+    };
+}} // end namespace boost::hana
+
+#endif // !BOOST_HANA_FWD_EXT_STD_INTEGER_SEQUENCE_HPP
diff --git a/include/boost/hana/ext/std/integral_constant/fwd.hpp b/include/boost/hana/fwd/ext/std/integral_constant.hpp
similarity index 52%
rename from include/boost/hana/ext/std/integral_constant/fwd.hpp
rename to include/boost/hana/fwd/ext/std/integral_constant.hpp
index 45dc52930..c83efcb71 100644
--- a/include/boost/hana/ext/std/integral_constant/fwd.hpp
+++ b/include/boost/hana/fwd/ext/std/integral_constant.hpp
@@ -1,14 +1,14 @@
 /*!
 @file
-Forward declares `boost::hana::StdIntegralConstant`.
+Forward declares `boost::hana::ext::std::IntegralConstant`.
 
 @copyright Louis Dionne 2014
 Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_FWD_HPP
-#define BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_FWD_HPP
+#ifndef BOOST_HANA_FWD_EXT_STD_INTEGRAL_CONSTANT_HPP
+#define BOOST_HANA_FWD_EXT_STD_INTEGRAL_CONSTANT_HPP
 
 #include <boost/hana/core/datatype.hpp>
 #include <boost/hana/core/when.hpp>
@@ -17,12 +17,12 @@ Distributed under the Boost Software License, Version 1.0.
 
 
 namespace boost { namespace hana {
-    struct StdIntegralConstant;
+    namespace ext { namespace std { struct IntegralConstant; }}
 
-    namespace adapted_detail {
+    namespace std_ic_detail {
         template <typename T, T v>
         constexpr bool
-        is_std_integral_constant(std::integral_constant<T, v>*)
+        is_std_integral_constant(::std::integral_constant<T, v>*)
         { return true; }
 
         constexpr bool is_std_integral_constant(...)
@@ -30,9 +30,9 @@ namespace boost { namespace hana {
     }
 
     template <typename T>
-    struct datatype<T, when<adapted_detail::is_std_integral_constant((T*)0)>> {
-        using type = StdIntegralConstant;
+    struct datatype<T, when<std_ic_detail::is_std_integral_constant((T*)0)>> {
+        using type = ext::std::IntegralConstant;
     };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_EXT_STD_INTEGRAL_CONSTANT_FWD_HPP
+#endif // !BOOST_HANA_FWD_EXT_STD_INTEGRAL_CONSTANT_HPP
diff --git a/include/boost/hana/ext/std/pair/pair.hpp b/include/boost/hana/fwd/ext/std/pair.hpp
similarity index 54%
rename from include/boost/hana/ext/std/pair/pair.hpp
rename to include/boost/hana/fwd/ext/std/pair.hpp
index 63c69744c..49f6ef2c6 100644
--- a/include/boost/hana/ext/std/pair/pair.hpp
+++ b/include/boost/hana/fwd/ext/std/pair.hpp
@@ -1,14 +1,14 @@
 /*!
 @file
-Forward declares `boost::hana::StdPair`.
+Forward declares `boost::hana::ext::std::Pair`.
 
 @copyright Louis Dionne 2014
 Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_EXT_STD_PAIR_PAIR_HPP
-#define BOOST_HANA_EXT_STD_PAIR_PAIR_HPP
+#ifndef BOOST_HANA_FWD_EXT_STD_PAIR_HPP
+#define BOOST_HANA_FWD_EXT_STD_PAIR_HPP
 
 #include <boost/hana/core/datatype.hpp>
 
@@ -16,12 +16,12 @@ Distributed under the Boost Software License, Version 1.0.
 
 
 namespace boost { namespace hana {
-    struct StdPair;
+    namespace ext { namespace std { struct Pair; }}
 
     template <typename First, typename Second>
-    struct datatype<std::pair<First, Second>> {
-        using type = StdPair;
+    struct datatype< ::std::pair<First, Second>> {
+        using type = ext::std::Pair;
     };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_EXT_STD_PAIR_PAIR_HPP
+#endif // !BOOST_HANA_FWD_EXT_STD_PAIR_HPP
diff --git a/include/boost/hana/fwd/ext/std/ratio.hpp b/include/boost/hana/fwd/ext/std/ratio.hpp
new file mode 100644
index 000000000..32e64d962
--- /dev/null
+++ b/include/boost/hana/fwd/ext/std/ratio.hpp
@@ -0,0 +1,28 @@
+/*!
+@file
+Forward declares `boost::hana::ext::std::Ratio`.
+
+@copyright Louis Dionne 2014
+Distributed under the Boost Software License, Version 1.0.
+(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+ */
+
+#ifndef BOOST_HANA_FWD_EXT_STD_RATIO_HPP
+#define BOOST_HANA_FWD_EXT_STD_RATIO_HPP
+
+#include <boost/hana/core/datatype.hpp>
+
+#include <cstdint>
+#include <ratio>
+
+
+namespace boost { namespace hana {
+    namespace ext { namespace std { struct Ratio; }}
+
+    template < ::std::intmax_t num, ::std::intmax_t den>
+    struct datatype< ::std::ratio<num, den>> {
+        using type = ext::std::Ratio;
+    };
+}} // end namespace boost::hana
+
+#endif // !BOOST_HANA_FWD_EXT_STD_RATIO_HPP
diff --git a/include/boost/hana/ext/std/tuple/tuple.hpp b/include/boost/hana/fwd/ext/std/tuple.hpp
similarity index 53%
rename from include/boost/hana/ext/std/tuple/tuple.hpp
rename to include/boost/hana/fwd/ext/std/tuple.hpp
index a3c6b20a3..e308180f8 100644
--- a/include/boost/hana/ext/std/tuple/tuple.hpp
+++ b/include/boost/hana/fwd/ext/std/tuple.hpp
@@ -1,14 +1,14 @@
 /*!
 @file
-Forward declares `boost::hana::StdTuple`.
+Forward declares `boost::hana::ext::std::Tuple`.
 
 @copyright Louis Dionne 2014
 Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_EXT_STD_TUPLE_TUPLE_HPP
-#define BOOST_HANA_EXT_STD_TUPLE_TUPLE_HPP
+#ifndef BOOST_HANA_FWD_EXT_STD_TUPLE_HPP
+#define BOOST_HANA_FWD_EXT_STD_TUPLE_HPP
 
 #include <boost/hana/core/datatype.hpp>
 
@@ -16,12 +16,12 @@ Distributed under the Boost Software License, Version 1.0.
 
 
 namespace boost { namespace hana {
-    struct StdTuple { };
+    namespace ext { namespace std { struct Tuple; }}
 
     template <typename ...Xs>
-    struct datatype<std::tuple<Xs...>> {
-        using type = StdTuple;
+    struct datatype< ::std::tuple<Xs...>> {
+        using type = ext::std::Tuple;
     };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_EXT_STD_TUPLE_TUPLE_HPP
+#endif // !BOOST_HANA_FWD_EXT_STD_TUPLE_HPP
diff --git a/include/boost/hana/foldable/foldable.hpp b/include/boost/hana/fwd/foldable.hpp
similarity index 99%
rename from include/boost/hana/foldable/foldable.hpp
rename to include/boost/hana/fwd/foldable.hpp
index 367082687..2817d51dc 100644
--- a/include/boost/hana/foldable/foldable.hpp
+++ b/include/boost/hana/fwd/foldable.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_FOLDABLE_FOLDABLE_HPP
-#define BOOST_HANA_FOLDABLE_FOLDABLE_HPP
+#ifndef BOOST_HANA_FWD_FOLDABLE_HPP
+#define BOOST_HANA_FWD_FOLDABLE_HPP
 
 #include <boost/hana/core/datatype.hpp>
 #include <boost/hana/core/typeclass.hpp>
@@ -408,4 +408,4 @@ namespace boost { namespace hana {
     };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_FOLDABLE_FOLDABLE_HPP
+#endif // !BOOST_HANA_FWD_FOLDABLE_HPP
diff --git a/include/boost/hana/functor/functor.hpp b/include/boost/hana/fwd/functor.hpp
similarity index 97%
rename from include/boost/hana/functor/functor.hpp
rename to include/boost/hana/fwd/functor.hpp
index 9fc4d5a94..3a7111d9a 100644
--- a/include/boost/hana/functor/functor.hpp
+++ b/include/boost/hana/fwd/functor.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_FUNCTOR_FUNCTOR_HPP
-#define BOOST_HANA_FUNCTOR_FUNCTOR_HPP
+#ifndef BOOST_HANA_FWD_FUNCTOR_HPP
+#define BOOST_HANA_FWD_FUNCTOR_HPP
 
 #include <boost/hana/core/datatype.hpp>
 #include <boost/hana/core/typeclass.hpp>
@@ -174,4 +174,4 @@ namespace boost { namespace hana {
     }
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_FUNCTOR_FUNCTOR_HPP
+#endif // !BOOST_HANA_FWD_FUNCTOR_HPP
diff --git a/include/boost/hana/group/group.hpp b/include/boost/hana/fwd/group.hpp
similarity index 96%
rename from include/boost/hana/group/group.hpp
rename to include/boost/hana/fwd/group.hpp
index ae6c3e5d0..517139134 100644
--- a/include/boost/hana/group/group.hpp
+++ b/include/boost/hana/fwd/group.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_GROUP_GROUP_HPP
-#define BOOST_HANA_GROUP_GROUP_HPP
+#ifndef BOOST_HANA_FWD_GROUP_HPP
+#define BOOST_HANA_FWD_GROUP_HPP
 
 #include <boost/hana/core/datatype.hpp>
 #include <boost/hana/core/typeclass.hpp>
@@ -80,4 +80,4 @@ namespace boost { namespace hana {
     };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_GROUP_GROUP_HPP
+#endif // !BOOST_HANA_FWD_GROUP_HPP
diff --git a/include/boost/hana/integer_list/integer_list.hpp b/include/boost/hana/fwd/integer_list.hpp
similarity index 85%
rename from include/boost/hana/integer_list/integer_list.hpp
rename to include/boost/hana/fwd/integer_list.hpp
index fc5e66df8..c8059333d 100644
--- a/include/boost/hana/integer_list/integer_list.hpp
+++ b/include/boost/hana/fwd/integer_list.hpp
@@ -7,12 +7,12 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_INTEGER_LIST_INTEGER_LIST_HPP
-#define BOOST_HANA_INTEGER_LIST_INTEGER_LIST_HPP
+#ifndef BOOST_HANA_FWD_INTEGER_LIST_HPP
+#define BOOST_HANA_FWD_INTEGER_LIST_HPP
 
-#include <boost/hana/comparable/operators.hpp>
 #include <boost/hana/core/operators.hpp>
-#include <boost/hana/monad/operators.hpp>
+#include <boost/hana/fwd/comparable.hpp>
+#include <boost/hana/fwd/monad.hpp>
 
 
 namespace boost { namespace hana {
@@ -46,4 +46,4 @@ namespace boost { namespace hana {
     constexpr ilist_detail::integer_list<T, xs...> integer_list{};
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_INTEGER_LIST_INTEGER_LIST_HPP
+#endif // !BOOST_HANA_FWD_INTEGER_LIST_HPP
diff --git a/include/boost/hana/integral/integral.hpp b/include/boost/hana/fwd/integral.hpp
similarity index 95%
rename from include/boost/hana/integral/integral.hpp
rename to include/boost/hana/fwd/integral.hpp
index 82f5f10dd..97dd03472 100644
--- a/include/boost/hana/integral/integral.hpp
+++ b/include/boost/hana/fwd/integral.hpp
@@ -7,21 +7,21 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_INTEGRAL_INTEGRAL_HPP
-#define BOOST_HANA_INTEGRAL_INTEGRAL_HPP
+#ifndef BOOST_HANA_FWD_INTEGRAL_HPP
+#define BOOST_HANA_FWD_INTEGRAL_HPP
 
-#include <boost/hana/comparable/operators.hpp>
 #include <boost/hana/core/operators.hpp>
 #include <boost/hana/detail/n_times.hpp>
 #include <boost/hana/detail/std/forward.hpp>
 #include <boost/hana/detail/std/remove_cv.hpp>
 #include <boost/hana/detail/std/size_t.hpp>
-#include <boost/hana/group/operators.hpp>
-#include <boost/hana/integral_domain/operators.hpp>
-#include <boost/hana/logical/operators.hpp>
-#include <boost/hana/monoid/operators.hpp>
-#include <boost/hana/orderable/operators.hpp>
-#include <boost/hana/ring/operators.hpp>
+#include <boost/hana/fwd/comparable.hpp>
+#include <boost/hana/fwd/group.hpp>
+#include <boost/hana/fwd/integral_domain.hpp>
+#include <boost/hana/fwd/logical.hpp>
+#include <boost/hana/fwd/monoid.hpp>
+#include <boost/hana/fwd/orderable.hpp>
+#include <boost/hana/fwd/ring.hpp>
 
 
 namespace boost { namespace hana {
@@ -249,4 +249,4 @@ namespace boost { namespace hana {
     }
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_INTEGRAL_INTEGRAL_HPP
+#endif // !BOOST_HANA_FWD_INTEGRAL_HPP
diff --git a/include/boost/hana/integral_constant/integral_constant.hpp b/include/boost/hana/fwd/integral_constant.hpp
similarity index 93%
rename from include/boost/hana/integral_constant/integral_constant.hpp
rename to include/boost/hana/fwd/integral_constant.hpp
index 16cacd0e8..a5e8e67f3 100644
--- a/include/boost/hana/integral_constant/integral_constant.hpp
+++ b/include/boost/hana/fwd/integral_constant.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_INTEGRAL_CONSTANT_INTEGRAL_CONSTANT_HPP
-#define BOOST_HANA_INTEGRAL_CONSTANT_INTEGRAL_CONSTANT_HPP
+#ifndef BOOST_HANA_FWD_INTEGRAL_CONSTANT_HPP
+#define BOOST_HANA_FWD_INTEGRAL_CONSTANT_HPP
 
 #include <boost/hana/core/datatype.hpp>
 #include <boost/hana/core/typeclass.hpp>
@@ -71,4 +71,4 @@ namespace boost { namespace hana {
         template integral_constant_impl<T, v>();
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_INTEGRAL_CONSTANT_INTEGRAL_CONSTANT_HPP
+#endif // !BOOST_HANA_FWD_INTEGRAL_CONSTANT_HPP
diff --git a/include/boost/hana/integral_domain/integral_domain.hpp b/include/boost/hana/fwd/integral_domain.hpp
similarity index 93%
rename from include/boost/hana/integral_domain/integral_domain.hpp
rename to include/boost/hana/fwd/integral_domain.hpp
index bbb43be88..1397dc2f4 100644
--- a/include/boost/hana/integral_domain/integral_domain.hpp
+++ b/include/boost/hana/fwd/integral_domain.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_INTEGRAL_DOMAIN_INTEGRAL_DOMAIN_HPP
-#define BOOST_HANA_INTEGRAL_DOMAIN_INTEGRAL_DOMAIN_HPP
+#ifndef BOOST_HANA_FWD_INTEGRAL_DOMAIN_HPP
+#define BOOST_HANA_FWD_INTEGRAL_DOMAIN_HPP
 
 #include <boost/hana/core/datatype.hpp>
 #include <boost/hana/core/typeclass.hpp>
@@ -76,4 +76,4 @@ namespace boost { namespace hana {
     };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_INTEGRAL_DOMAIN_INTEGRAL_DOMAIN_HPP
+#endif // !BOOST_HANA_FWD_INTEGRAL_DOMAIN_HPP
diff --git a/include/boost/hana/iterable/iterable.hpp b/include/boost/hana/fwd/iterable.hpp
similarity index 96%
rename from include/boost/hana/iterable/iterable.hpp
rename to include/boost/hana/fwd/iterable.hpp
index 81a67858a..6c95d2089 100644
--- a/include/boost/hana/iterable/iterable.hpp
+++ b/include/boost/hana/fwd/iterable.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_ITERABLE_ITERABLE_HPP
-#define BOOST_HANA_ITERABLE_ITERABLE_HPP
+#ifndef BOOST_HANA_FWD_ITERABLE_HPP
+#define BOOST_HANA_FWD_ITERABLE_HPP
 
 #include <boost/hana/core/datatype.hpp>
 #include <boost/hana/core/typeclass.hpp>
@@ -19,6 +19,11 @@ Distributed under the Boost Software License, Version 1.0.
 
 
 namespace boost { namespace hana {
+    namespace operators {
+        template <typename Derived>
+        struct Iterable_ops;
+    }
+
     //! @ingroup group-typeclasses
     //! `Iterable` represents data structures supporting external iteration.
     //!
@@ -37,6 +42,10 @@ namespace boost { namespace hana {
     //! This is basically saying that linearizing a `Foldable` and then
     //! iterating through it should be equivalent to iterating through it
     //! in the first place.
+    //!
+    //! @todo Either make it a requirement of Iterable to be convertible to a
+    //! Tuple (since it's used in the laws), or require something strictly
+    //! more general.
     struct Iterable {
         BOOST_HANA_TYPECLASS(Iterable);
         struct mcd;
@@ -277,4 +286,4 @@ namespace boost { namespace hana {
     };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_ITERABLE_ITERABLE_HPP
+#endif // !BOOST_HANA_FWD_ITERABLE_HPP
diff --git a/include/boost/hana/lazy/lazy.hpp b/include/boost/hana/fwd/lazy.hpp
similarity index 95%
rename from include/boost/hana/lazy/lazy.hpp
rename to include/boost/hana/fwd/lazy.hpp
index abf05dd69..d9ee1e4cd 100644
--- a/include/boost/hana/lazy/lazy.hpp
+++ b/include/boost/hana/fwd/lazy.hpp
@@ -7,12 +7,12 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_LAZY_LAZY_HPP
-#define BOOST_HANA_LAZY_LAZY_HPP
+#ifndef BOOST_HANA_FWD_LAZY_HPP
+#define BOOST_HANA_FWD_LAZY_HPP
 
 #include <boost/hana/core/operators.hpp>
 #include <boost/hana/detail/constexpr.hpp>
-#include <boost/hana/monad/operators.hpp>
+#include <boost/hana/fwd/monad.hpp>
 
 
 namespace boost { namespace hana {
@@ -78,4 +78,4 @@ namespace boost { namespace hana {
     };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_LAZY_LAZY_HPP
+#endif // !BOOST_HANA_FWD_LAZY_HPP
diff --git a/include/boost/hana/list/list.hpp b/include/boost/hana/fwd/list.hpp
similarity index 99%
rename from include/boost/hana/list/list.hpp
rename to include/boost/hana/fwd/list.hpp
index b44210de7..879c9b7b3 100644
--- a/include/boost/hana/list/list.hpp
+++ b/include/boost/hana/fwd/list.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_LIST_LIST_HPP
-#define BOOST_HANA_LIST_LIST_HPP
+#ifndef BOOST_HANA_FWD_LIST_HPP
+#define BOOST_HANA_FWD_LIST_HPP
 
 #include <boost/hana/core/datatype.hpp>
 #include <boost/hana/core/is_a.hpp>
@@ -1008,4 +1008,4 @@ namespace boost { namespace hana {
     };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_LIST_LIST_HPP
+#endif // !BOOST_HANA_FWD_LIST_HPP
diff --git a/include/boost/hana/logical/logical.hpp b/include/boost/hana/fwd/logical.hpp
similarity index 98%
rename from include/boost/hana/logical/logical.hpp
rename to include/boost/hana/fwd/logical.hpp
index 5a137f21c..88d7391c0 100644
--- a/include/boost/hana/logical/logical.hpp
+++ b/include/boost/hana/fwd/logical.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_LOGICAL_LOGICAL_HPP
-#define BOOST_HANA_LOGICAL_LOGICAL_HPP
+#ifndef BOOST_HANA_FWD_LOGICAL_HPP
+#define BOOST_HANA_FWD_LOGICAL_HPP
 
 #include <boost/hana/core/datatype.hpp>
 #include <boost/hana/core/typeclass.hpp>
@@ -187,4 +187,4 @@ namespace boost { namespace hana {
     };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_LOGICAL_LOGICAL_HPP
+#endif // !BOOST_HANA_FWD_LOGICAL_HPP
diff --git a/include/boost/hana/map/map.hpp b/include/boost/hana/fwd/map.hpp
similarity index 93%
rename from include/boost/hana/map/map.hpp
rename to include/boost/hana/fwd/map.hpp
index 7255cdc72..708750a65 100644
--- a/include/boost/hana/map/map.hpp
+++ b/include/boost/hana/fwd/map.hpp
@@ -7,17 +7,17 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_MAP_MAP_HPP
-#define BOOST_HANA_MAP_MAP_HPP
+#ifndef BOOST_HANA_FWD_MAP_HPP
+#define BOOST_HANA_FWD_MAP_HPP
 
-#include <boost/hana/comparable/operators.hpp>
 #include <boost/hana/core/operators.hpp>
 #include <boost/hana/detail/constexpr.hpp>
 #include <boost/hana/detail/std/forward.hpp>
 #include <boost/hana/detail/std/move.hpp>
-#include <boost/hana/functor/functor.hpp>
-#include <boost/hana/list/list.hpp>
-#include <boost/hana/product/product.hpp>
+#include <boost/hana/fwd/comparable.hpp>
+#include <boost/hana/fwd/functor.hpp>
+#include <boost/hana/fwd/list.hpp>
+#include <boost/hana/fwd/product.hpp>
 #include <boost/hana/tuple.hpp>
 
 
@@ -110,4 +110,4 @@ namespace boost { namespace hana {
 #endif
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_MAP_MAP_HPP
+#endif // !BOOST_HANA_FWD_MAP_HPP
diff --git a/include/boost/hana/maybe/maybe.hpp b/include/boost/hana/fwd/maybe.hpp
similarity index 97%
rename from include/boost/hana/maybe/maybe.hpp
rename to include/boost/hana/fwd/maybe.hpp
index 1be4f9733..6d3d68cce 100644
--- a/include/boost/hana/maybe/maybe.hpp
+++ b/include/boost/hana/fwd/maybe.hpp
@@ -7,18 +7,18 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_MAYBE_MAYBE_HPP
-#define BOOST_HANA_MAYBE_MAYBE_HPP
+#ifndef BOOST_HANA_FWD_MAYBE_HPP
+#define BOOST_HANA_FWD_MAYBE_HPP
 
 #include <boost/hana/bool.hpp>
-#include <boost/hana/comparable/operators.hpp>
 #include <boost/hana/core/operators.hpp>
 #include <boost/hana/detail/constexpr.hpp>
 #include <boost/hana/detail/std/forward.hpp>
 #include <boost/hana/detail/std/move.hpp>
 #include <boost/hana/functional/id.hpp>
-#include <boost/hana/logical/logical.hpp>
-#include <boost/hana/monad/operators.hpp>
+#include <boost/hana/fwd/comparable.hpp>
+#include <boost/hana/fwd/logical.hpp>
+#include <boost/hana/fwd/monad.hpp>
 
 
 namespace boost { namespace hana {
@@ -238,4 +238,4 @@ namespace boost { namespace hana {
     };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_MAYBE_MAYBE_HPP
+#endif // !BOOST_HANA_FWD_MAYBE_HPP
diff --git a/include/boost/hana/monad/monad.hpp b/include/boost/hana/fwd/monad.hpp
similarity index 97%
rename from include/boost/hana/monad/monad.hpp
rename to include/boost/hana/fwd/monad.hpp
index 9423b1a18..1ba22a5f5 100644
--- a/include/boost/hana/monad/monad.hpp
+++ b/include/boost/hana/fwd/monad.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_MONAD_MONAD_HPP
-#define BOOST_HANA_MONAD_MONAD_HPP
+#ifndef BOOST_HANA_FWD_MONAD_HPP
+#define BOOST_HANA_FWD_MONAD_HPP
 
 #include <boost/hana/core/datatype.hpp>
 #include <boost/hana/core/typeclass.hpp>
@@ -154,4 +154,4 @@ namespace boost { namespace hana {
 #endif
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_MONAD_MONAD_HPP
+#endif // !BOOST_HANA_FWD_MONAD_HPP
diff --git a/include/boost/hana/monoid/monoid.hpp b/include/boost/hana/fwd/monoid.hpp
similarity index 95%
rename from include/boost/hana/monoid/monoid.hpp
rename to include/boost/hana/fwd/monoid.hpp
index d5c8bd912..3ffb9d5d7 100644
--- a/include/boost/hana/monoid/monoid.hpp
+++ b/include/boost/hana/fwd/monoid.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_MONOID_MONOID_HPP
-#define BOOST_HANA_MONOID_MONOID_HPP
+#ifndef BOOST_HANA_FWD_MONOID_HPP
+#define BOOST_HANA_FWD_MONOID_HPP
 
 #include <boost/hana/core/datatype.hpp>
 #include <boost/hana/core/typeclass.hpp>
@@ -71,4 +71,4 @@ namespace boost { namespace hana {
     BOOST_HANA_CONSTEXPR_LAMBDA auto zero = Monoid::instance<M, M>::zero_impl();
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_MONOID_MONOID_HPP
+#endif // !BOOST_HANA_FWD_MONOID_HPP
diff --git a/include/boost/hana/orderable/orderable.hpp b/include/boost/hana/fwd/orderable.hpp
similarity index 97%
rename from include/boost/hana/orderable/orderable.hpp
rename to include/boost/hana/fwd/orderable.hpp
index 7c6dd110d..e6b6ba6f6 100644
--- a/include/boost/hana/orderable/orderable.hpp
+++ b/include/boost/hana/fwd/orderable.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_ORDERABLE_ORDERABLE_HPP
-#define BOOST_HANA_ORDERABLE_ORDERABLE_HPP
+#ifndef BOOST_HANA_FWD_ORDERABLE_HPP
+#define BOOST_HANA_FWD_ORDERABLE_HPP
 
 #include <boost/hana/core/datatype.hpp>
 #include <boost/hana/core/typeclass.hpp>
@@ -153,4 +153,4 @@ namespace boost { namespace hana {
     };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_ORDERABLE_ORDERABLE_HPP
+#endif // !BOOST_HANA_FWD_ORDERABLE_HPP
diff --git a/include/boost/hana/pair/pair.hpp b/include/boost/hana/fwd/pair.hpp
similarity index 89%
rename from include/boost/hana/pair/pair.hpp
rename to include/boost/hana/fwd/pair.hpp
index 3f2a014f2..9df3b57b1 100644
--- a/include/boost/hana/pair/pair.hpp
+++ b/include/boost/hana/fwd/pair.hpp
@@ -7,13 +7,13 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_PAIR_FWD_HPP
-#define BOOST_HANA_PAIR_FWD_HPP
+#ifndef BOOST_HANA_FWD_PAIR_HPP
+#define BOOST_HANA_FWD_PAIR_HPP
 
-#include <boost/hana/comparable/operators.hpp>
 #include <boost/hana/core/operators.hpp>
 #include <boost/hana/detail/constexpr.hpp>
 #include <boost/hana/detail/std/move.hpp>
+#include <boost/hana/fwd/comparable.hpp>
 
 
 namespace boost { namespace hana {
@@ -45,4 +45,4 @@ namespace boost { namespace hana {
     };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_PAIR_FWD_HPP
+#endif // !BOOST_HANA_FWD_PAIR_HPP
diff --git a/include/boost/hana/product/product.hpp b/include/boost/hana/fwd/product.hpp
similarity index 96%
rename from include/boost/hana/product/product.hpp
rename to include/boost/hana/fwd/product.hpp
index 12b1319f0..f8bd38a9b 100644
--- a/include/boost/hana/product/product.hpp
+++ b/include/boost/hana/fwd/product.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_PRODUCT_PRODUCT_HPP
-#define BOOST_HANA_PRODUCT_PRODUCT_HPP
+#ifndef BOOST_HANA_FWD_PRODUCT_HPP
+#define BOOST_HANA_FWD_PRODUCT_HPP
 
 #include <boost/hana/core/datatype.hpp>
 #include <boost/hana/core/is_a.hpp>
@@ -114,4 +114,4 @@ namespace boost { namespace hana {
     };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_PRODUCT_PRODUCT_HPP
+#endif // !BOOST_HANA_FWD_PRODUCT_HPP
diff --git a/include/boost/hana/range/range.hpp b/include/boost/hana/fwd/range.hpp
similarity index 92%
rename from include/boost/hana/range/range.hpp
rename to include/boost/hana/fwd/range.hpp
index a8bfbd479..b7ce6e518 100644
--- a/include/boost/hana/range/range.hpp
+++ b/include/boost/hana/fwd/range.hpp
@@ -7,15 +7,15 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_RANGE_RANGE_HPP
-#define BOOST_HANA_RANGE_RANGE_HPP
+#ifndef BOOST_HANA_FWD_RANGE_HPP
+#define BOOST_HANA_FWD_RANGE_HPP
 
-#include <boost/hana/comparable/operators.hpp>
 #include <boost/hana/core/operators.hpp>
 #include <boost/hana/detail/constexpr.hpp>
+#include <boost/hana/fwd/comparable.hpp>
+#include <boost/hana/fwd/iterable.hpp>
+#include <boost/hana/fwd/orderable.hpp>
 #include <boost/hana/integral.hpp>
-#include <boost/hana/iterable/operators.hpp>
-#include <boost/hana/orderable/orderable.hpp>
 
 
 namespace boost { namespace hana {
@@ -89,4 +89,4 @@ namespace boost { namespace hana {
     BOOST_HANA_CONSTEXPR_LAMBDA auto range_c = range(integral<T, from>, integral<T, to>);
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_RANGE_RANGE_HPP
+#endif // !BOOST_HANA_FWD_RANGE_HPP
diff --git a/include/boost/hana/record/record.hpp b/include/boost/hana/fwd/record.hpp
similarity index 96%
rename from include/boost/hana/record/record.hpp
rename to include/boost/hana/fwd/record.hpp
index 4d370344b..27450c231 100644
--- a/include/boost/hana/record/record.hpp
+++ b/include/boost/hana/fwd/record.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_RECORD_RECORD_HPP
-#define BOOST_HANA_RECORD_RECORD_HPP
+#ifndef BOOST_HANA_FWD_RECORD_HPP
+#define BOOST_HANA_FWD_RECORD_HPP
 
 #include <boost/hana/core/typeclass.hpp>
 #include <boost/hana/detail/constexpr.hpp>
@@ -82,4 +82,4 @@ namespace boost { namespace hana {
     >::members_impl();
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_RECORD_RECORD_HPP
+#endif // !BOOST_HANA_FWD_RECORD_HPP
diff --git a/include/boost/hana/ring/ring.hpp b/include/boost/hana/fwd/ring.hpp
similarity index 95%
rename from include/boost/hana/ring/ring.hpp
rename to include/boost/hana/fwd/ring.hpp
index 6b072ee1c..0ccbf497d 100644
--- a/include/boost/hana/ring/ring.hpp
+++ b/include/boost/hana/fwd/ring.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_RING_RING_HPP
-#define BOOST_HANA_RING_RING_HPP
+#ifndef BOOST_HANA_FWD_RING_HPP
+#define BOOST_HANA_FWD_RING_HPP
 
 #include <boost/hana/core/datatype.hpp>
 #include <boost/hana/core/typeclass.hpp>
@@ -72,4 +72,4 @@ namespace boost { namespace hana {
     BOOST_HANA_CONSTEXPR_LAMBDA auto one = Ring::instance<R, R>::one_impl();
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_RING_RING_HPP
+#endif // !BOOST_HANA_FWD_RING_HPP
diff --git a/include/boost/hana/searchable/searchable.hpp b/include/boost/hana/fwd/searchable.hpp
similarity index 98%
rename from include/boost/hana/searchable/searchable.hpp
rename to include/boost/hana/fwd/searchable.hpp
index 0bf2ddae5..b71b2d9ed 100644
--- a/include/boost/hana/searchable/searchable.hpp
+++ b/include/boost/hana/fwd/searchable.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_SEARCHABLE_SEARCHABLE_HPP
-#define BOOST_HANA_SEARCHABLE_SEARCHABLE_HPP
+#ifndef BOOST_HANA_FWD_SEARCHABLE_HPP
+#define BOOST_HANA_FWD_SEARCHABLE_HPP
 
 #include <boost/hana/core/datatype.hpp>
 #include <boost/hana/core/typeclass.hpp>
@@ -339,4 +339,4 @@ namespace boost { namespace hana {
     };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_SEARCHABLE_SEARCHABLE_HPP
+#endif // !BOOST_HANA_FWD_SEARCHABLE_HPP
diff --git a/include/boost/hana/set/set.hpp b/include/boost/hana/fwd/set.hpp
similarity index 94%
rename from include/boost/hana/set/set.hpp
rename to include/boost/hana/fwd/set.hpp
index 1fcd33fc0..5f7a50a1c 100644
--- a/include/boost/hana/set/set.hpp
+++ b/include/boost/hana/fwd/set.hpp
@@ -7,14 +7,14 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_SET_SET_HPP
-#define BOOST_HANA_SET_SET_HPP
+#ifndef BOOST_HANA_FWD_SET_HPP
+#define BOOST_HANA_FWD_SET_HPP
 
-#include <boost/hana/comparable/operators.hpp>
 #include <boost/hana/core/make.hpp>
 #include <boost/hana/core/operators.hpp>
 #include <boost/hana/detail/constexpr.hpp>
 #include <boost/hana/detail/std/move.hpp>
+#include <boost/hana/fwd/comparable.hpp>
 #include <boost/hana/tuple.hpp>
 
 
@@ -90,4 +90,4 @@ namespace boost { namespace hana {
 #endif
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_SET_SET_HPP
+#endif // !BOOST_HANA_FWD_SET_HPP
diff --git a/include/boost/hana/string/string.hpp b/include/boost/hana/fwd/string.hpp
similarity index 92%
rename from include/boost/hana/string/string.hpp
rename to include/boost/hana/fwd/string.hpp
index b89783c6f..d8037fedd 100644
--- a/include/boost/hana/string/string.hpp
+++ b/include/boost/hana/fwd/string.hpp
@@ -7,15 +7,15 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_STRING_STRING_HPP
-#define BOOST_HANA_STRING_STRING_HPP
+#ifndef BOOST_HANA_FWD_STRING_HPP
+#define BOOST_HANA_FWD_STRING_HPP
 
-#include <boost/hana/comparable/operators.hpp>
 #include <boost/hana/core/operators.hpp>
 #include <boost/hana/detail/std/integer_sequence.hpp>
 #include <boost/hana/detail/std/size_t.hpp>
-#include <boost/hana/iterable/operators.hpp>
-#include <boost/hana/orderable/operators.hpp>
+#include <boost/hana/fwd/comparable.hpp>
+#include <boost/hana/fwd/iterable.hpp>
+#include <boost/hana/fwd/orderable.hpp>
 
 
 namespace boost { namespace hana {
@@ -92,4 +92,4 @@ namespace boost { namespace hana {
 /**/
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_STRING_STRING_HPP
+#endif // !BOOST_HANA_FWD_STRING_HPP
diff --git a/include/boost/hana/traversable/traversable.hpp b/include/boost/hana/fwd/traversable.hpp
similarity index 97%
rename from include/boost/hana/traversable/traversable.hpp
rename to include/boost/hana/fwd/traversable.hpp
index 6dda00d32..7a3808cad 100644
--- a/include/boost/hana/traversable/traversable.hpp
+++ b/include/boost/hana/fwd/traversable.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_TRAVERSABLE_TRAVERSABLE_HPP
-#define BOOST_HANA_TRAVERSABLE_TRAVERSABLE_HPP
+#ifndef BOOST_HANA_FWD_TRAVERSABLE_HPP
+#define BOOST_HANA_FWD_TRAVERSABLE_HPP
 
 #include <boost/hana/core/datatype.hpp>
 #include <boost/hana/core/typeclass.hpp>
@@ -141,4 +141,4 @@ namespace boost { namespace hana {
 #endif
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_TRAVERSABLE_TRAVERSABLE_HPP
+#endif // !BOOST_HANA_FWD_TRAVERSABLE_HPP
diff --git a/include/boost/hana/tuple/tuple.hpp b/include/boost/hana/fwd/tuple.hpp
similarity index 89%
rename from include/boost/hana/tuple/tuple.hpp
rename to include/boost/hana/fwd/tuple.hpp
index ed23e2cb6..cd15f4fdc 100644
--- a/include/boost/hana/tuple/tuple.hpp
+++ b/include/boost/hana/fwd/tuple.hpp
@@ -7,16 +7,16 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_TUPLE_TUPLE_HPP
-#define BOOST_HANA_TUPLE_TUPLE_HPP
+#ifndef BOOST_HANA_FWD_TUPLE_HPP
+#define BOOST_HANA_FWD_TUPLE_HPP
 
-#include <boost/hana/comparable/operators.hpp>
 #include <boost/hana/core/operators.hpp>
 #include <boost/hana/detail/constexpr.hpp>
 #include <boost/hana/detail/std/forward.hpp>
 #include <boost/hana/detail/std/move.hpp>
-#include <boost/hana/iterable/operators.hpp>
-#include <boost/hana/monad/operators.hpp>
+#include <boost/hana/fwd/comparable.hpp>
+#include <boost/hana/fwd/iterable.hpp>
+#include <boost/hana/fwd/monad.hpp>
 
 
 namespace boost { namespace hana {
@@ -64,4 +64,4 @@ namespace boost { namespace hana {
     };
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_TUPLE_TUPLE_HPP
+#endif // !BOOST_HANA_FWD_TUPLE_HPP
diff --git a/include/boost/hana/type/type.hpp b/include/boost/hana/fwd/type.hpp
similarity index 98%
rename from include/boost/hana/type/type.hpp
rename to include/boost/hana/fwd/type.hpp
index 5ff3fad76..17981421e 100644
--- a/include/boost/hana/type/type.hpp
+++ b/include/boost/hana/fwd/type.hpp
@@ -7,11 +7,11 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_TYPE_TYPE_HPP
-#define BOOST_HANA_TYPE_TYPE_HPP
+#ifndef BOOST_HANA_FWD_TYPE_HPP
+#define BOOST_HANA_FWD_TYPE_HPP
 
-#include <boost/hana/comparable/operators.hpp>
 #include <boost/hana/core/operators.hpp>
+#include <boost/hana/fwd/comparable.hpp>
 
 
 namespace boost { namespace hana {
@@ -279,4 +279,4 @@ namespace boost { namespace hana {
     constexpr type_detail::trait_<f> trait_{};
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_TYPE_TYPE_HPP
+#endif // !BOOST_HANA_FWD_TYPE_HPP
diff --git a/include/boost/hana/type_list/type_list.hpp b/include/boost/hana/fwd/type_list.hpp
similarity index 88%
rename from include/boost/hana/type_list/type_list.hpp
rename to include/boost/hana/fwd/type_list.hpp
index fa40248d3..f3f4ee9f9 100644
--- a/include/boost/hana/type_list/type_list.hpp
+++ b/include/boost/hana/fwd/type_list.hpp
@@ -7,12 +7,12 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_TYPE_LIST_TYPE_LIST_HPP
-#define BOOST_HANA_TYPE_LIST_TYPE_LIST_HPP
+#ifndef BOOST_HANA_FWD_TYPE_LIST_HPP
+#define BOOST_HANA_FWD_TYPE_LIST_HPP
 
-#include <boost/hana/comparable/operators.hpp>
 #include <boost/hana/core/operators.hpp>
-#include <boost/hana/monad/operators.hpp>
+#include <boost/hana/fwd/comparable.hpp>
+#include <boost/hana/fwd/monad.hpp>
 
 
 namespace boost { namespace hana {
@@ -56,4 +56,4 @@ namespace boost { namespace hana {
     constexpr typename detail::repr::type_list<xs...>::hidden type_list{};
 }} // end namespace boost::hana
 
-#endif // !BOOST_HANA_TYPE_LIST_TYPE_LIST_HPP
+#endif // !BOOST_HANA_FWD_TYPE_LIST_HPP
diff --git a/include/boost/hana/group.hpp b/include/boost/hana/group.hpp
index 29a914325..e8c5f79fc 100644
--- a/include/boost/hana/group.hpp
+++ b/include/boost/hana/group.hpp
@@ -10,10 +10,54 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_GROUP_HPP
 #define BOOST_HANA_GROUP_HPP
 
-#include <boost/hana/group/group.hpp>
-#include <boost/hana/group/integral_constant_mcd.hpp>
-#include <boost/hana/group/minus_mcd.hpp>
-#include <boost/hana/group/negate_mcd.hpp>
-#include <boost/hana/group/operators.hpp>
+#include <boost/hana/fwd/group.hpp>
+
+#include <boost/hana/core/datatype.hpp>
+#include <boost/hana/core/operators.hpp>
+#include <boost/hana/detail/std/enable_if.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+#include <boost/hana/monoid.hpp>
+
+
+namespace boost { namespace hana {
+    //! Minimal complete definition: `minus`
+    template <typename G1, typename G2>
+    struct Group::minus_mcd {
+        template <typename X>
+        static constexpr auto negate_impl(X x) {
+            return minus(zero<G1>, x);
+        }
+    };
+
+    //! Minimal complete definition: `negate`
+    template <typename G1, typename G2>
+    struct Group::negate_mcd {
+        template <typename X, typename Y>
+        static constexpr auto minus_impl(X x, Y y) {
+            return plus(x, negate(y));
+        }
+    };
+
+    namespace operators {
+        //! Equivalent to `minus`.
+        //! @relates boost::hana::Group
+        template <typename X, typename Y, typename = detail::std::enable_if_t<
+            enable_operators<Group, datatype_t<X>>::value ||
+            enable_operators<Group, datatype_t<Y>>::value
+        >>
+        constexpr decltype(auto) operator-(X&& x, Y&& y) {
+            return minus(detail::std::forward<X>(x),
+                         detail::std::forward<Y>(y));
+        }
+
+        //! Equivalent to `negate`.
+        //! @relates boost::hana::Group
+        template <typename X, typename = detail::std::enable_if_t<
+            enable_operators<Group, datatype_t<X>>::value
+        >>
+        constexpr decltype(auto) operator-(X&& x)
+        { return negate(detail::std::forward<X>(x)); }
+    }
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_GROUP_HPP
diff --git a/include/boost/hana/group/integral_constant_mcd.hpp b/include/boost/hana/group/integral_constant_mcd.hpp
deleted file mode 100644
index bc405623e..000000000
--- a/include/boost/hana/group/integral_constant_mcd.hpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Group::integral_constant_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_GROUP_INTEGRAL_CONSTANT_MCD_HPP
-#define BOOST_HANA_GROUP_INTEGRAL_CONSTANT_MCD_HPP
-
-#include <boost/hana/constant/constant.hpp>
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/detail/std/is_integral.hpp>
-#include <boost/hana/group/minus_mcd.hpp>
-#include <boost/hana/integral_constant/integral_constant.hpp>
-
-
-namespace boost { namespace hana {
-    //! Any two `IntegralConstant`s form an additive `Group`.
-    template <typename I1, typename I2>
-    struct Group::integral_constant_mcd : Group::minus_mcd<I1, I2> {
-        template <typename X, typename Y>
-        static constexpr auto minus_impl(X x, Y y) {
-            constexpr auto sub = value(x) - value(y);
-            return integral_constant<I1, decltype(sub), sub>;
-        }
-    };
-
-    template <typename I, typename T>
-    struct Group::instance<I, T, when<
-        is_an<IntegralConstant, I>() &&
-        detail::std::is_integral<T>{}
-    >>
-        : Group::minus_mcd<I, T>
-    {
-        template <typename X, typename Y>
-        static constexpr auto minus_impl(X x, Y y)
-        { return value(x) - y; }
-    };
-
-    template <typename T, typename I>
-    struct Group::instance<T, I, when<
-        detail::std::is_integral<T>{} &&
-        is_an<IntegralConstant, I>()
-    >>
-        : Group::minus_mcd<T, I>
-    {
-        template <typename X, typename Y>
-        static constexpr auto minus_impl(X x, Y y)
-        { return x - value(y); }
-    };
-
-    template <typename I1, typename I2>
-    struct Group::instance<I1, I2, when<
-        is_an<IntegralConstant, I1>() &&
-        is_an<IntegralConstant, I2>()
-    >>
-        : Group::integral_constant_mcd<I1, I2>
-    { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_GROUP_INTEGRAL_CONSTANT_MCD_HPP
diff --git a/include/boost/hana/group/minus_mcd.hpp b/include/boost/hana/group/minus_mcd.hpp
deleted file mode 100644
index 60add1983..000000000
--- a/include/boost/hana/group/minus_mcd.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Group::minus_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_GROUP_MINUS_MCD_HPP
-#define BOOST_HANA_GROUP_MINUS_MCD_HPP
-
-#include <boost/hana/group/group.hpp>
-#include <boost/hana/monoid/monoid.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition: `minus`
-    template <typename G1, typename G2>
-    struct Group::minus_mcd {
-        template <typename X>
-        static constexpr auto negate_impl(X x) {
-            return minus(zero<G1>, x);
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_GROUP_MINUS_MCD_HPP
diff --git a/include/boost/hana/group/negate_mcd.hpp b/include/boost/hana/group/negate_mcd.hpp
deleted file mode 100644
index 92d25417a..000000000
--- a/include/boost/hana/group/negate_mcd.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Group::negate_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_GROUP_NEGATE_MCD_HPP
-#define BOOST_HANA_GROUP_NEGATE_MCD_HPP
-
-#include <boost/hana/group/group.hpp>
-#include <boost/hana/monoid/monoid.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition: `negate`
-    template <typename G1, typename G2>
-    struct Group::negate_mcd {
-        template <typename X, typename Y>
-        static constexpr auto minus_impl(X x, Y y) {
-            return plus(x, negate(y));
-        }
-    };
-}}
-
-#endif // !BOOST_HANA_GROUP_NEGATE_MCD_HPP
diff --git a/include/boost/hana/group/operators.hpp b/include/boost/hana/group/operators.hpp
deleted file mode 100644
index 64a29c244..000000000
--- a/include/boost/hana/group/operators.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*!
-@file
-Defines custom operators for `boost::hana::Group`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_GROUP_OPERATORS_HPP
-#define BOOST_HANA_GROUP_OPERATORS_HPP
-
-#include <boost/hana/group/group.hpp>
-
-#include <boost/hana/core/datatype.hpp>
-#include <boost/hana/core/operators.hpp>
-#include <boost/hana/detail/std/enable_if.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-
-
-namespace boost { namespace hana { namespace operators {
-    //! Equivalent to `minus`.
-    //! @relates boost::hana::Group
-    template <typename X, typename Y, typename = detail::std::enable_if_t<
-        enable_operators<Group, datatype_t<X>>::value ||
-        enable_operators<Group, datatype_t<Y>>::value
-    >>
-    constexpr decltype(auto) operator-(X&& x, Y&& y) {
-        return minus(detail::std::forward<X>(x),
-                     detail::std::forward<Y>(y));
-    }
-
-    //! Equivalent to `negate`.
-    //! @relates boost::hana::Group
-    template <typename X, typename = detail::std::enable_if_t<
-        enable_operators<Group, datatype_t<X>>::value
-    >>
-    constexpr decltype(auto) operator-(X&& x)
-    { return negate(detail::std::forward<X>(x)); }
-}}} // end namespace boost::hana::operators
-
-#endif // !BOOST_HANA_GROUP_OPERATORS_HPP
diff --git a/include/boost/hana/integer_list.hpp b/include/boost/hana/integer_list.hpp
index e093a8d62..ad400ccbf 100644
--- a/include/boost/hana/integer_list.hpp
+++ b/include/boost/hana/integer_list.hpp
@@ -10,20 +10,63 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_INTEGER_LIST_HPP
 #define BOOST_HANA_INTEGER_LIST_HPP
 
-#include <boost/hana/integer_list/integer_list.hpp>
-#include <boost/hana/integer_list/convert.hpp>
+#include <boost/hana/fwd/integer_list.hpp>
 
-// Instances
-#include <boost/hana/integer_list/functor.hpp>
-#include <boost/hana/integer_list/applicative.hpp>
-#include <boost/hana/integer_list/monad.hpp>
-#include <boost/hana/integer_list/traversable.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/integral.hpp>
 
-#include <boost/hana/integer_list/foldable.hpp>
-#include <boost/hana/integer_list/iterable.hpp>
-#include <boost/hana/integer_list/list.hpp>
-#include <boost/hana/integer_list/searchable.hpp>
+// instances
+#include <boost/hana/iterable.hpp>
+#include <boost/hana/list.hpp>
 
-#include <boost/hana/integer_list/comparable.hpp>
+
+namespace boost { namespace hana {
+    //! Instance of `Iterable` for `IntegerList`s.
+    //!
+    //! The head of `integer_list<T, x, xs...>` is `integral<T, x>`, its tail
+    //! is `integer_list<T, xs...>` and an integer list is empty if and only
+    //! if it contains no integers at all.
+    template <>
+    struct Iterable::instance<IntegerList> : Iterable::mcd {
+        template <typename T, T x, T ...xs>
+        static constexpr auto head_impl(ilist_detail::integer_list<T, x, xs...>) {
+            return integral<T, x>;
+        }
+
+        template <typename T, T x, T ...xs>
+        static constexpr auto tail_impl(ilist_detail::integer_list<T, x, xs...>) {
+            return integer_list<T, xs...>;
+        }
+
+        template <typename T, T ...xs>
+        static constexpr auto is_empty_impl(ilist_detail::integer_list<T, xs...>) {
+            return bool_<sizeof...(xs) == 0>;
+        }
+    };
+
+    //! Instance of `List` for `IntegerList`s.
+    //!
+    //! An `Integral` can be prepended to an `IntegerList` by using `cons`;
+    //! however the `cons`ed value has to be convertible to the type of the
+    //! integers in the list. An empty `IntegerList` can be created with
+    //! `nil<IntegerList>`; the type of the `Integral`s it contains will be
+    //! set when an element is added to the list.
+    template <>
+    struct List::instance<IntegerList> : List::mcd<IntegerList> {
+        template <typename X, typename T, T ...xs>
+        static constexpr auto cons_impl(X x, ilist_detail::integer_list<T, xs...>) {
+            return integer_list<T, static_cast<T>(x), xs...>;
+        }
+
+        template <typename X>
+        static constexpr auto cons_impl(X x, ilist_detail::integer_list<void>) {
+            return integer_list<decltype(x()), x()>;
+        }
+
+        static constexpr auto nil_impl() {
+            return integer_list<void>;
+        }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_INTEGER_LIST_HPP
diff --git a/include/boost/hana/integer_list/applicative.hpp b/include/boost/hana/integer_list/applicative.hpp
deleted file mode 100644
index 17a2a09c3..000000000
--- a/include/boost/hana/integer_list/applicative.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Applicative` for `boost::hana::IntegerList`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_INTEGER_LIST_APPLICATIVE_HPP
-#define BOOST_HANA_INTEGER_LIST_APPLICATIVE_HPP
-
-#include <boost/hana/integer_list/list.hpp>
-#include <boost/hana/integer_list/functor.hpp>
-#include <boost/hana/applicative/list_mcd.hpp>
-
-#endif // !BOOST_HANA_INTEGER_LIST_APPLICATIVE_HPP
diff --git a/include/boost/hana/integer_list/comparable.hpp b/include/boost/hana/integer_list/comparable.hpp
deleted file mode 100644
index eb276d02c..000000000
--- a/include/boost/hana/integer_list/comparable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Comparable` for `boost::hana::IntegerList`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_INTEGER_LIST_COMPARABLE_HPP
-#define BOOST_HANA_INTEGER_LIST_COMPARABLE_HPP
-
-#include <boost/hana/integer_list/list.hpp>
-#include <boost/hana/comparable/list_mcd.hpp>
-
-#endif // !BOOST_HANA_INTEGER_LIST_COMPARABLE_HPP
diff --git a/include/boost/hana/integer_list/convert.hpp b/include/boost/hana/integer_list/convert.hpp
deleted file mode 100644
index 40fad8332..000000000
--- a/include/boost/hana/integer_list/convert.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the conversions to a `boost::hana::IntegerList`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_INTEGER_LIST_CONVERT_HPP
-#define BOOST_HANA_INTEGER_LIST_CONVERT_HPP
-
-#include <boost/hana/integer_list/list.hpp>
-#include <boost/hana/list/convert.hpp>
-
-#endif // !BOOST_HANA_INTEGER_LIST_CONVERT_HPP
diff --git a/include/boost/hana/integer_list/foldable.hpp b/include/boost/hana/integer_list/foldable.hpp
deleted file mode 100644
index a5d1a3c1b..000000000
--- a/include/boost/hana/integer_list/foldable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Foldable` for `boost::hana::IntegerList`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_INTEGER_LIST_FOLDABLE_HPP
-#define BOOST_HANA_INTEGER_LIST_FOLDABLE_HPP
-
-#include <boost/hana/integer_list/iterable.hpp>
-#include <boost/hana/foldable/iterable_mcd.hpp>
-
-#endif // !BOOST_HANA_INTEGER_LIST_FOLDABLE_HPP
diff --git a/include/boost/hana/integer_list/functor.hpp b/include/boost/hana/integer_list/functor.hpp
deleted file mode 100644
index 739fb3959..000000000
--- a/include/boost/hana/integer_list/functor.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Functor` for `boost::hana::IntegerList`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_INTEGER_LIST_FUNCTOR_HPP
-#define BOOST_HANA_INTEGER_LIST_FUNCTOR_HPP
-
-#include <boost/hana/integer_list/list.hpp>
-#include <boost/hana/functor/list_mcd.hpp>
-
-#endif // !BOOST_HANA_INTEGER_LIST_FUNCTOR_HPP
diff --git a/include/boost/hana/integer_list/iterable.hpp b/include/boost/hana/integer_list/iterable.hpp
deleted file mode 100644
index afb6557f4..000000000
--- a/include/boost/hana/integer_list/iterable.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Iterable` for `boost::hana::IntegerList`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_INTEGER_LIST_ITERABLE_HPP
-#define BOOST_HANA_INTEGER_LIST_ITERABLE_HPP
-
-#include <boost/hana/bool.hpp>
-#include <boost/hana/integer_list/integer_list.hpp>
-#include <boost/hana/integral.hpp>
-#include <boost/hana/iterable/mcd.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Iterable` for `IntegerList`s.
-    //!
-    //! The head of `integer_list<T, x, xs...>` is `integral<T, x>`, its tail
-    //! is `integer_list<T, xs...>` and an integer list is empty if and only
-    //! if it contains no integers at all.
-    template <>
-    struct Iterable::instance<IntegerList> : Iterable::mcd {
-        template <typename T, T x, T ...xs>
-        static constexpr auto head_impl(ilist_detail::integer_list<T, x, xs...>) {
-            return integral<T, x>;
-        }
-
-        template <typename T, T x, T ...xs>
-        static constexpr auto tail_impl(ilist_detail::integer_list<T, x, xs...>) {
-            return integer_list<T, xs...>;
-        }
-
-        template <typename T, T ...xs>
-        static constexpr auto is_empty_impl(ilist_detail::integer_list<T, xs...>) {
-            return bool_<sizeof...(xs) == 0>;
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_INTEGER_LIST_ITERABLE_HPP
diff --git a/include/boost/hana/integer_list/list.hpp b/include/boost/hana/integer_list/list.hpp
deleted file mode 100644
index 048834577..000000000
--- a/include/boost/hana/integer_list/list.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::List` for `boost::hana::IntegerList`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_INTEGER_LIST_LIST_HPP
-#define BOOST_HANA_INTEGER_LIST_LIST_HPP
-
-#include <boost/hana/integer_list/integer_list.hpp>
-#include <boost/hana/list/mcd.hpp>
-
-// Mcd
-#include <boost/hana/integer_list/monad.hpp>
-#include <boost/hana/integer_list/foldable.hpp>
-#include <boost/hana/integer_list/iterable.hpp>
-
-
-namespace boost { namespace hana {
-    //! @details
-    //! An `Integral` can be prepended to an `IntegerList` by using `cons`;
-    //! however the `cons`ed value has to be convertible to the type of the
-    //! integers in the list. An empty `IntegerList` can be created with
-    //! `nil<IntegerList>`; the type of the `Integral`s it contains will be
-    //! set when an element is added to the list.
-    template <>
-    struct List::instance<IntegerList> : List::mcd<IntegerList> {
-        template <typename X, typename T, T ...xs>
-        static constexpr auto cons_impl(X x, ilist_detail::integer_list<T, xs...>) {
-            return integer_list<T, static_cast<T>(x), xs...>;
-        }
-
-        template <typename X>
-        static constexpr auto cons_impl(X x, ilist_detail::integer_list<void>) {
-            return integer_list<decltype(x()), x()>;
-        }
-
-        static constexpr auto nil_impl() {
-            return integer_list<void>;
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_INTEGER_LIST_LIST_HPP
diff --git a/include/boost/hana/integer_list/monad.hpp b/include/boost/hana/integer_list/monad.hpp
deleted file mode 100644
index 7c4a4109e..000000000
--- a/include/boost/hana/integer_list/monad.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Monad` for `boost::hana::IntegerList`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_INTEGER_LIST_MONAD_HPP
-#define BOOST_HANA_INTEGER_LIST_MONAD_HPP
-
-#include <boost/hana/integer_list/list.hpp>
-#include <boost/hana/integer_list/applicative.hpp>
-#include <boost/hana/monad/list_mcd.hpp>
-
-#endif // !BOOST_HANA_INTEGER_LIST_MONAD_HPP
diff --git a/include/boost/hana/integer_list/searchable.hpp b/include/boost/hana/integer_list/searchable.hpp
deleted file mode 100644
index d89c4ec86..000000000
--- a/include/boost/hana/integer_list/searchable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Searchable` for `boost::hana::IntegerList`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_INTEGER_LIST_SEARCHABLE_HPP
-#define BOOST_HANA_INTEGER_LIST_SEARCHABLE_HPP
-
-#include <boost/hana/integer_list/list.hpp>
-#include <boost/hana/searchable/list_mcd.hpp>
-
-#endif // !BOOST_HANA_INTEGER_LIST_SEARCHABLE_HPP
diff --git a/include/boost/hana/integer_list/traversable.hpp b/include/boost/hana/integer_list/traversable.hpp
deleted file mode 100644
index 48a94e4e6..000000000
--- a/include/boost/hana/integer_list/traversable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Traversable` for `boost::hana::IntegerList`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_INTEGER_LIST_TRAVERSABLE_HPP
-#define BOOST_HANA_INTEGER_LIST_TRAVERSABLE_HPP
-
-#include <boost/hana/integer_list/list.hpp>
-#include <boost/hana/traversable/list_mcd.hpp>
-
-#endif // !BOOST_HANA_INTEGER_LIST_TRAVERSABLE_HPP
diff --git a/include/boost/hana/integral.hpp b/include/boost/hana/integral.hpp
index d8873c707..df9f0ee03 100644
--- a/include/boost/hana/integral.hpp
+++ b/include/boost/hana/integral.hpp
@@ -10,19 +10,27 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_INTEGRAL_HPP
 #define BOOST_HANA_INTEGRAL_HPP
 
-#include <boost/hana/integral/integral.hpp>
+#include <boost/hana/fwd/integral.hpp>
 
-// Instances
-#include <boost/hana/integral/comparable.hpp>
-#include <boost/hana/integral/orderable.hpp>
-#include <boost/hana/integral/logical.hpp>
-#include <boost/hana/integral/constant.hpp>
-#include <boost/hana/integral/integral_constant.hpp>
-#include <boost/hana/integral/enumerable.hpp>
+// instances
+#include <boost/hana/constant.hpp>
+#include <boost/hana/integral_constant.hpp>
 
-#include <boost/hana/integral/monoid.hpp>
-#include <boost/hana/integral/group.hpp>
-#include <boost/hana/integral/ring.hpp>
-#include <boost/hana/integral/integral_domain.hpp>
+
+namespace boost { namespace hana {
+    template <>
+    struct Constant::instance<Integral> : Constant::mcd {
+        template <typename C>
+        static constexpr auto value_impl(C const&)
+        { return C::value; }
+    };
+
+    template <>
+    struct IntegralConstant::instance<Integral> : IntegralConstant::mcd {
+        template <typename T, T v>
+        static constexpr auto integral_constant_impl()
+        { return integral<T, v>; }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_INTEGRAL_HPP
diff --git a/include/boost/hana/integral/comparable.hpp b/include/boost/hana/integral/comparable.hpp
deleted file mode 100644
index 216cc15ee..000000000
--- a/include/boost/hana/integral/comparable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Comparable` for `boost::hana::Integral`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_INTEGRAL_COMPARABLE_HPP
-#define BOOST_HANA_INTEGRAL_COMPARABLE_HPP
-
-#include <boost/hana/integral/integral_constant.hpp>
-#include <boost/hana/comparable/integral_constant_mcd.hpp>
-
-#endif // !BOOST_HANA_INTEGRAL_COMPARABLE_HPP
diff --git a/include/boost/hana/integral/constant.hpp b/include/boost/hana/integral/constant.hpp
deleted file mode 100644
index c1bae0345..000000000
--- a/include/boost/hana/integral/constant.hpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Constant` for `boost::hana::Integral`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_INTEGRAL_CONSTANT_HPP
-#define BOOST_HANA_INTEGRAL_CONSTANT_HPP
-
-#include <boost/hana/constant/mcd.hpp>
-#include <boost/hana/integral/integral.hpp>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct Constant::instance<Integral> : Constant::mcd {
-        template <typename C>
-        static constexpr auto value_impl(C const&)
-        { return C::value; }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_INTEGRAL_CONSTANT_HPP
diff --git a/include/boost/hana/integral/enumerable.hpp b/include/boost/hana/integral/enumerable.hpp
deleted file mode 100644
index 2420ca54a..000000000
--- a/include/boost/hana/integral/enumerable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Enumerable` for `boost::hana::Integral`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_INTEGRAL_ENUMERABLE_HPP
-#define BOOST_HANA_INTEGRAL_ENUMERABLE_HPP
-
-#include <boost/hana/integral/integral_constant.hpp>
-#include <boost/hana/enumerable/integral_constant_mcd.hpp>
-
-#endif // !BOOST_HANA_INTEGRAL_ENUMERABLE_HPP
diff --git a/include/boost/hana/integral/group.hpp b/include/boost/hana/integral/group.hpp
deleted file mode 100644
index a5e0cf378..000000000
--- a/include/boost/hana/integral/group.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Group` for `boost::hana::Integral`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_INTEGRAL_GROUP_HPP
-#define BOOST_HANA_INTEGRAL_GROUP_HPP
-
-#include <boost/hana/integral/integral_constant.hpp>
-#include <boost/hana/group/integral_constant_mcd.hpp>
-
-#endif // !BOOST_HANA_INTEGRAL_GROUP_HPP
diff --git a/include/boost/hana/integral/integral_constant.hpp b/include/boost/hana/integral/integral_constant.hpp
deleted file mode 100644
index d27192053..000000000
--- a/include/boost/hana/integral/integral_constant.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::IntegralConstant` for `boost::hana::Integral`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_INTEGRAL_INTEGRAL_CONSTANT_HPP
-#define BOOST_HANA_INTEGRAL_INTEGRAL_CONSTANT_HPP
-
-#include <boost/hana/integral_constant/mcd.hpp>
-#include <boost/hana/integral/integral.hpp>
-
-// Mcd
-#include <boost/hana/integral/constant.hpp>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct IntegralConstant::instance<Integral> : IntegralConstant::mcd {
-        template <typename T, T v>
-        static constexpr auto integral_constant_impl()
-        { return integral<T, v>; }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_INTEGRAL_INTEGRAL_CONSTANT_HPP
diff --git a/include/boost/hana/integral/integral_domain.hpp b/include/boost/hana/integral/integral_domain.hpp
deleted file mode 100644
index 3ad72fc91..000000000
--- a/include/boost/hana/integral/integral_domain.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::IntegralDomain` for `boost::hana::Integral`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_INTEGRAL_INTEGRAL_DOMAIN_HPP
-#define BOOST_HANA_INTEGRAL_INTEGRAL_DOMAIN_HPP
-
-#include <boost/hana/integral/integral_constant.hpp>
-#include <boost/hana/integral_domain/integral_constant_mcd.hpp>
-
-#endif // !BOOST_HANA_INTEGRAL_INTEGRAL_DOMAIN_HPP
diff --git a/include/boost/hana/integral/logical.hpp b/include/boost/hana/integral/logical.hpp
deleted file mode 100644
index 900cab90c..000000000
--- a/include/boost/hana/integral/logical.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Logical` for `boost::hana::Integral`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_INTEGRAL_LOGICAL_HPP
-#define BOOST_HANA_INTEGRAL_LOGICAL_HPP
-
-#include <boost/hana/integral/integral_constant.hpp>
-#include <boost/hana/logical/integral_constant_mcd.hpp>
-
-#endif // !BOOST_HANA_INTEGRAL_LOGICAL_HPP
diff --git a/include/boost/hana/integral/monoid.hpp b/include/boost/hana/integral/monoid.hpp
deleted file mode 100644
index 5ba2651d2..000000000
--- a/include/boost/hana/integral/monoid.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Monoid` for `boost::hana::Integral`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_INTEGRAL_MONOID_HPP
-#define BOOST_HANA_INTEGRAL_MONOID_HPP
-
-#include <boost/hana/integral/integral_constant.hpp>
-#include <boost/hana/monoid/integral_constant_mcd.hpp>
-
-#endif // !BOOST_HANA_INTEGRAL_MONOID_HPP
diff --git a/include/boost/hana/integral/orderable.hpp b/include/boost/hana/integral/orderable.hpp
deleted file mode 100644
index d3da790a5..000000000
--- a/include/boost/hana/integral/orderable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Orderable` for `boost::hana::Integral`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_INTEGRAL_ORDERABLE_HPP
-#define BOOST_HANA_INTEGRAL_ORDERABLE_HPP
-
-#include <boost/hana/integral/integral_constant.hpp>
-#include <boost/hana/orderable/integral_constant_mcd.hpp>
-
-#endif // !BOOST_HANA_INTEGRAL_ORDERABLE_HPP
diff --git a/include/boost/hana/integral/ring.hpp b/include/boost/hana/integral/ring.hpp
deleted file mode 100644
index fffe38351..000000000
--- a/include/boost/hana/integral/ring.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Ring` for `boost::hana::Integral`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_INTEGRAL_RING_HPP
-#define BOOST_HANA_INTEGRAL_RING_HPP
-
-#include <boost/hana/integral/integral_constant.hpp>
-#include <boost/hana/ring/integral_constant_mcd.hpp>
-
-#endif // !BOOST_HANA_INTEGRAL_RING_HPP
diff --git a/include/boost/hana/integral_constant.hpp b/include/boost/hana/integral_constant.hpp
index c6d7a4c69..1c50faa49 100644
--- a/include/boost/hana/integral_constant.hpp
+++ b/include/boost/hana/integral_constant.hpp
@@ -10,7 +10,372 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_INTEGRAL_CONSTANT_HPP
 #define BOOST_HANA_INTEGRAL_CONSTANT_HPP
 
-#include <boost/hana/integral_constant/integral_constant.hpp>
-#include <boost/hana/integral_constant/mcd.hpp>
+#include <boost/hana/fwd/integral_constant.hpp>
+
+#include <boost/hana/constant.hpp>
+#include <boost/hana/core/is_a.hpp>
+#include <boost/hana/core/when.hpp>
+#include <boost/hana/detail/constexpr.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+#include <boost/hana/detail/std/is_integral.hpp>
+
+// provided instances
+#include <boost/hana/comparable.hpp>
+#include <boost/hana/enumerable.hpp>
+#include <boost/hana/group.hpp>
+#include <boost/hana/integral_domain.hpp>
+#include <boost/hana/logical.hpp>
+#include <boost/hana/monoid.hpp>
+#include <boost/hana/orderable.hpp>
+#include <boost/hana/ring.hpp>
+
+
+namespace boost { namespace hana {
+    //! Minimal complete definition: `Constant` and `integral_constant`.
+    struct IntegralConstant::mcd { };
+
+    template <typename I1, typename I2>
+    struct Comparable::integral_constant_mcd : Comparable::equal_mcd {
+        template <typename X, typename Y>
+        static constexpr decltype(auto) equal_impl(X x, Y y) {
+            constexpr auto eq = value(x) == value(y);
+            return integral_constant<I1, decltype(eq), eq>;
+        }
+    };
+
+    template <typename I, typename T>
+    struct Comparable::instance<I, T, when<
+        is_an<IntegralConstant, I>() &&
+        detail::std::is_integral<T>{}
+    >>
+        : Comparable::equal_mcd
+    {
+        template <typename X, typename Y>
+        static constexpr decltype(auto) equal_impl(X&& x, Y&& y) {
+            return value(detail::std::forward<X>(x)) ==
+                   detail::std::forward<Y>(y);
+        }
+    };
+
+    template <typename T, typename I>
+    struct Comparable::instance<T, I, when<
+        detail::std::is_integral<T>{} &&
+        is_an<IntegralConstant, I>()
+    >>
+        : Comparable::equal_mcd
+    {
+        template <typename X, typename Y>
+        static constexpr decltype(auto) equal_impl(X&& x, Y&& y) {
+            return detail::std::forward<X>(x) ==
+                   value(detail::std::forward<Y>(y));
+        }
+    };
+
+    template <typename I1, typename I2>
+    struct Comparable::instance<I1, I2, when<
+        is_an<IntegralConstant, I1>() &&
+        is_an<IntegralConstant, I2>()
+    >>
+        : Comparable::integral_constant_mcd<I1, I2>
+    { };
+
+    template <typename I>
+    struct Enumerable::integral_constant_mcd : Enumerable::mcd {
+    private:
+        template <typename X> static constexpr auto inc(X x) { return ++x; }
+        template <typename X> static constexpr auto dec(X x) { return --x; }
+
+    public:
+        template <typename X>
+        static constexpr decltype(auto) succ_impl(X x) {
+            constexpr auto n = value(x);
+            return integral_constant<I, decltype(inc(n)), inc(n)>;
+        }
+
+        template <typename X>
+        static constexpr decltype(auto) pred_impl(X x) {
+            constexpr auto n = value(x);
+            return integral_constant<I, decltype(dec(n)), dec(n)>;
+        }
+    };
+
+    //! Instance of `Enumerable` for `IntegralConstant`s.
+    //!
+    //! This instance of `Enumerable` reflects the usual definition of
+    //! `succ` and `pred` for natural numbers. Specifically, `succ(n)`
+    //! is an `IntegralConstant` holding `++value(n)`, and `pred(n)` is
+    //! an `IntegralConstant` holding `--value(n)`.
+    //!
+    //! ### Example
+    //! @snippet example/integral_constant.cpp enumerable
+    template <typename I>
+    struct Enumerable::instance<I, when<is_an<IntegralConstant, I>()>>
+        : Enumerable::integral_constant_mcd<I>
+    { };
+
+    //! Any two `IntegralConstant`s form an additive `Group`.
+    template <typename I1, typename I2>
+    struct Group::integral_constant_mcd : Group::minus_mcd<I1, I2> {
+        template <typename X, typename Y>
+        static constexpr auto minus_impl(X x, Y y) {
+            constexpr auto sub = value(x) - value(y);
+            return integral_constant<I1, decltype(sub), sub>;
+        }
+    };
+
+    template <typename I, typename T>
+    struct Group::instance<I, T, when<
+        is_an<IntegralConstant, I>() &&
+        detail::std::is_integral<T>{}
+    >>
+        : Group::minus_mcd<I, T>
+    {
+        template <typename X, typename Y>
+        static constexpr auto minus_impl(X x, Y y)
+        { return value(x) - y; }
+    };
+
+    template <typename T, typename I>
+    struct Group::instance<T, I, when<
+        detail::std::is_integral<T>{} &&
+        is_an<IntegralConstant, I>()
+    >>
+        : Group::minus_mcd<T, I>
+    {
+        template <typename X, typename Y>
+        static constexpr auto minus_impl(X x, Y y)
+        { return x - value(y); }
+    };
+
+    template <typename I1, typename I2>
+    struct Group::instance<I1, I2, when<
+        is_an<IntegralConstant, I1>() &&
+        is_an<IntegralConstant, I2>()
+    >>
+        : Group::integral_constant_mcd<I1, I2>
+    { };
+
+    //! Any two `IntegralConstant`s form a multiplicative `IntegralDomain`.
+    template <typename I1, typename I2>
+    struct IntegralDomain::integral_constant_mcd : IntegralDomain::mcd {
+        template <typename X, typename Y>
+        static constexpr auto quot_impl(X x, Y y) {
+            constexpr auto quotient = value(x) / value(y);
+            return integral_constant<I1, decltype(quotient), quotient>;
+        }
+
+        template <typename X, typename Y>
+        static constexpr auto mod_impl(X x, Y y) {
+            constexpr auto modulus = value(x) % value(y);
+            return integral_constant<I1, decltype(modulus), modulus>;
+        }
+    };
+
+    template <typename I, typename T>
+    struct IntegralDomain::instance<I, T, when<
+        is_an<IntegralConstant, I>() &&
+        detail::std::is_integral<T>{}
+    >>
+        : IntegralDomain::mcd
+    {
+        template <typename X, typename Y>
+        static constexpr auto quot_impl(X x, Y y)
+        { return value(x) / y; }
+
+        template <typename X, typename Y>
+        static constexpr auto mod_impl(X x, Y y)
+        { return value(x) % y; }
+    };
+
+    template <typename T, typename I>
+    struct IntegralDomain::instance<T, I, when<
+        detail::std::is_integral<T>{} &&
+        is_an<IntegralConstant, I>()
+    >>
+        : IntegralDomain::mcd
+    {
+        template <typename X, typename Y>
+        static constexpr auto quot_impl(X x, Y y)
+        { return x / value(y); }
+
+        template <typename X, typename Y>
+        static constexpr auto mod_impl(X x, Y y)
+        { return x % value(y); }
+    };
+
+    template <typename I1, typename I2>
+    struct IntegralDomain::instance<I1, I2, when<
+        is_an<IntegralConstant, I1>() &&
+        is_an<IntegralConstant, I2>()
+    >>
+        : IntegralDomain::integral_constant_mcd<I1, I2>
+    { };
+
+    //! Instance of `Logical` for `IntegralConstant`s.
+    //!
+    //! An `IntegralConstant` is true-valued if and only if its integral
+    //! value is true-valued, i.e. if
+    //! @code
+    //!     static_cast<bool>(value(n)) == true
+    //! @endcode
+    template <typename I>
+    struct Logical::integral_constant_mcd : Logical::mcd {
+        template <bool> struct tval { };
+
+        template <typename Then, typename Else>
+        static constexpr auto eval_if_impl(tval<true>, Then t, Else e)
+        { return t([](auto x) { return x; }); }
+
+        template <typename Then, typename Else>
+        static constexpr auto eval_if_impl(tval<false>, Then t, Else e)
+        { return e([](auto x) { return x; }); }
+
+        template <typename Cond, typename Then, typename Else>
+        static constexpr auto eval_if_impl(Cond c, Then t, Else e)
+        { return eval_if_impl(tval<static_cast<bool>(value(c))>{}, t, e); }
+
+        template <typename Cond>
+        static constexpr auto not_impl(Cond c) {
+            constexpr auto nc = !value(c);
+            return integral_constant<I, decltype(nc), nc>;
+        }
+    };
+
+    template <typename I>
+    struct Logical::instance<I, when<is_an<IntegralConstant, I>()>>
+        : Logical::integral_constant_mcd<I>
+    { };
+
+    //! Any two `IntegralConstant`s form an additive `Monoid`.
+    template <typename I1, typename I2>
+    struct Monoid::integral_constant_mcd : Monoid::mcd {
+        template <typename X, typename Y>
+        static constexpr auto plus_impl(X x, Y y) {
+            constexpr auto sum = value(x) + value(y);
+            return integral_constant<I1, decltype(sum), sum>;
+        }
+
+        static BOOST_HANA_CONSTEXPR_LAMBDA auto zero_impl()
+        { return integral_constant<I1, int, 0>; }
+    };
+
+    template <typename I, typename T>
+    struct Monoid::instance<I, T, when<
+        is_an<IntegralConstant, I>() &&
+        detail::std::is_integral<T>{}
+    >>
+        : Monoid::mcd
+    {
+        template <typename X, typename Y>
+        static constexpr auto plus_impl(X x, Y y)
+        { return value(x) + y; }
+    };
+
+    template <typename T, typename I>
+    struct Monoid::instance<T, I, when<
+        detail::std::is_integral<T>{} &&
+        is_an<IntegralConstant, I>()
+    >>
+        : Monoid::mcd
+    {
+        template <typename X, typename Y>
+        static constexpr auto plus_impl(X x, Y y)
+        { return x + value(y); }
+    };
+
+    template <typename I1, typename I2>
+    struct Monoid::instance<I1, I2, when<
+        is_an<IntegralConstant, I1>() &&
+        is_an<IntegralConstant, I2>()
+    >>
+        : Monoid::integral_constant_mcd<I1, I2>
+    { };
+
+    template <typename I1, typename I2>
+    struct Orderable::integral_constant_mcd : Orderable::less_mcd {
+        template <typename X, typename Y>
+        static constexpr auto less_impl(X x, Y y) {
+            constexpr auto ord = value(x) < value(y);
+            return integral_constant<I1, decltype(ord), ord>;
+        }
+    };
+
+    template <typename I, typename T>
+    struct Orderable::instance<I, T, when<
+        is_an<IntegralConstant, I>() &&
+        detail::std::is_integral<T>{}
+    >>
+        : Orderable::less_mcd
+    {
+        template <typename X, typename Y>
+        static constexpr auto less_impl(X x, Y y)
+        { return value(x) < y; }
+    };
+
+    template <typename T, typename I>
+    struct Orderable::instance<T, I, when<
+        detail::std::is_integral<T>{} &&
+        is_an<IntegralConstant, I>()
+    >>
+        : Orderable::less_mcd
+    {
+        template <typename X, typename Y>
+        static constexpr auto less_impl(X x, Y y)
+        { return x < value(y); }
+    };
+
+    template <typename I1, typename I2>
+    struct Orderable::instance<I1, I2, when<
+        is_an<IntegralConstant, I1>() &&
+        is_an<IntegralConstant, I2>()
+    >>
+        : Orderable::integral_constant_mcd<I1, I2>
+    { };
+
+    //! Any two `IntegralConstant`s form a multiplicative `Ring`.
+    template <typename I1, typename I2>
+    struct Ring::integral_constant_mcd : Ring::mcd {
+        template <typename X, typename Y>
+        static constexpr auto mult_impl(X x, Y y) {
+            constexpr auto prod = value(x) * value(y);
+            return integral_constant<I1, decltype(prod), prod>;
+        }
+
+        static BOOST_HANA_CONSTEXPR_LAMBDA auto one_impl()
+        { return integral_constant<I1, int, 1>; }
+    };
+
+    template <typename I, typename T>
+    struct Ring::instance<I, T, when<
+        is_an<IntegralConstant, I>() &&
+        detail::std::is_integral<T>{}
+    >>
+        : Ring::mcd
+    {
+        template <typename X, typename Y>
+        static constexpr auto mult_impl(X x, Y y)
+        { return value(x) * y; }
+    };
+
+    template <typename T, typename I>
+    struct Ring::instance<T, I, when<
+        detail::std::is_integral<T>{} &&
+        is_an<IntegralConstant, I>()
+    >>
+        : Ring::mcd
+    {
+        template <typename X, typename Y>
+        static constexpr auto mult_impl(X x, Y y)
+        { return x * value(y); }
+    };
+
+    template <typename I1, typename I2>
+    struct Ring::instance<I1, I2, when<
+        is_an<IntegralConstant, I1>() &&
+        is_an<IntegralConstant, I2>()
+    >>
+        : Ring::integral_constant_mcd<I1, I2>
+    { };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_INTEGRAL_CONSTANT_HPP
diff --git a/include/boost/hana/integral_constant/mcd.hpp b/include/boost/hana/integral_constant/mcd.hpp
deleted file mode 100644
index fdbc8a56c..000000000
--- a/include/boost/hana/integral_constant/mcd.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*!
-@file
-Defines `boost::hana::IntegralConstant::mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_INTEGRAL_CONSTANT_MCD_HPP
-#define BOOST_HANA_INTEGRAL_CONSTANT_MCD_HPP
-
-#include <boost/hana/integral_constant/integral_constant.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition: `Constant` and `integral_constant`.
-    struct IntegralConstant::mcd { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_INTEGRAL_CONSTANT_MCD_HPP
diff --git a/include/boost/hana/integral_domain.hpp b/include/boost/hana/integral_domain.hpp
index e681118da..09af7b677 100644
--- a/include/boost/hana/integral_domain.hpp
+++ b/include/boost/hana/integral_domain.hpp
@@ -10,9 +10,37 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_INTEGRAL_DOMAIN_HPP
 #define BOOST_HANA_INTEGRAL_DOMAIN_HPP
 
-#include <boost/hana/integral_domain/integral_constant_mcd.hpp>
-#include <boost/hana/integral_domain/integral_domain.hpp>
-#include <boost/hana/integral_domain/mcd.hpp>
-#include <boost/hana/integral_domain/operators.hpp>
+#include <boost/hana/fwd/integral_domain.hpp>
+
+#include <boost/hana/core/datatype.hpp>
+#include <boost/hana/core/operators.hpp>
+#include <boost/hana/detail/std/enable_if.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+
+
+namespace boost { namespace hana {
+    //! Minimal complete definition : `quot` and `mod`
+    struct IntegralDomain::mcd { };
+
+    namespace operators {
+        //! Equivalent to `mod`.
+        //! @relates boost::hana::IntegralDomain
+        template <typename X, typename Y, typename = typename detail::std::enable_if<
+            enable_operators<IntegralDomain, datatype_t<X>>::value ||
+            enable_operators<IntegralDomain, datatype_t<Y>>::value
+        >::type>
+        constexpr decltype(auto) operator%(X&& x, Y&& y)
+        { return mod(detail::std::forward<X>(x), detail::std::forward<Y>(y)); }
+
+        //! Equivalent to `quot`.
+        //! @relates boost::hana::IntegralDomain
+        template <typename X, typename Y, typename = typename detail::std::enable_if<
+            enable_operators<IntegralDomain, datatype_t<X>>::value ||
+            enable_operators<IntegralDomain, datatype_t<Y>>::value
+        >::type>
+        constexpr decltype(auto) operator/(X&& x, Y&& y)
+        { return quot(detail::std::forward<X>(x), detail::std::forward<Y>(y)); }
+    }
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_INTEGRAL_DOMAIN_HPP
diff --git a/include/boost/hana/integral_domain/integral_constant_mcd.hpp b/include/boost/hana/integral_domain/integral_constant_mcd.hpp
deleted file mode 100644
index 83efad38c..000000000
--- a/include/boost/hana/integral_domain/integral_constant_mcd.hpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*!
-@file
-Defines `boost::hana::IntegralDomain::integral_constant_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_INTEGRAL_DOMAIN_INTEGRAL_CONSTANT_MCD_HPP
-#define BOOST_HANA_INTEGRAL_DOMAIN_INTEGRAL_CONSTANT_MCD_HPP
-
-#include <boost/hana/constant/constant.hpp>
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/detail/std/is_integral.hpp>
-#include <boost/hana/integral_constant/integral_constant.hpp>
-#include <boost/hana/integral_domain/mcd.hpp>
-
-
-namespace boost { namespace hana {
-    //! Any two `IntegralConstant`s form a multiplicative `IntegralDomain`.
-    template <typename I1, typename I2>
-    struct IntegralDomain::integral_constant_mcd : IntegralDomain::mcd {
-        template <typename X, typename Y>
-        static constexpr auto quot_impl(X x, Y y) {
-            constexpr auto quotient = value(x) / value(y);
-            return integral_constant<I1, decltype(quotient), quotient>;
-        }
-
-        template <typename X, typename Y>
-        static constexpr auto mod_impl(X x, Y y) {
-            constexpr auto modulus = value(x) % value(y);
-            return integral_constant<I1, decltype(modulus), modulus>;
-        }
-    };
-
-    template <typename I, typename T>
-    struct IntegralDomain::instance<I, T, when<
-        is_an<IntegralConstant, I>() &&
-        detail::std::is_integral<T>{}
-    >>
-        : IntegralDomain::mcd
-    {
-        template <typename X, typename Y>
-        static constexpr auto quot_impl(X x, Y y)
-        { return value(x) / y; }
-
-        template <typename X, typename Y>
-        static constexpr auto mod_impl(X x, Y y)
-        { return value(x) % y; }
-    };
-
-    template <typename T, typename I>
-    struct IntegralDomain::instance<T, I, when<
-        detail::std::is_integral<T>{} &&
-        is_an<IntegralConstant, I>()
-    >>
-        : IntegralDomain::mcd
-    {
-        template <typename X, typename Y>
-        static constexpr auto quot_impl(X x, Y y)
-        { return x / value(y); }
-
-        template <typename X, typename Y>
-        static constexpr auto mod_impl(X x, Y y)
-        { return x % value(y); }
-    };
-
-    template <typename I1, typename I2>
-    struct IntegralDomain::instance<I1, I2, when<
-        is_an<IntegralConstant, I1>() &&
-        is_an<IntegralConstant, I2>()
-    >>
-        : IntegralDomain::integral_constant_mcd<I1, I2>
-    { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_INTEGRAL_DOMAIN_INTEGRAL_CONSTANT_MCD_HPP
diff --git a/include/boost/hana/integral_domain/mcd.hpp b/include/boost/hana/integral_domain/mcd.hpp
deleted file mode 100644
index cd5665d52..000000000
--- a/include/boost/hana/integral_domain/mcd.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*!
-@file
-Defines `boost::hana::IntegralDomain::mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_INTEGRAL_DOMAIN_MCD_HPP
-#define BOOST_HANA_INTEGRAL_DOMAIN_MCD_HPP
-
-#include <boost/hana/integral_domain/integral_domain.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition : `quot` and `mod`
-    struct IntegralDomain::mcd { };
-}}
-
-#endif // !BOOST_HANA_INTEGRAL_DOMAIN_MCD_HPP
diff --git a/include/boost/hana/integral_domain/operators.hpp b/include/boost/hana/integral_domain/operators.hpp
deleted file mode 100644
index eca2a1d61..000000000
--- a/include/boost/hana/integral_domain/operators.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*!
-@file
-Defines custom operators for `boost::hana::IntegralDomain`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_INTEGRAL_DOMAIN_OPERATORS_HPP
-#define BOOST_HANA_INTEGRAL_DOMAIN_OPERATORS_HPP
-
-#include <boost/hana/integral_domain/integral_domain.hpp>
-
-#include <boost/hana/core/datatype.hpp>
-#include <boost/hana/core/operators.hpp>
-#include <boost/hana/detail/std/enable_if.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-
-
-namespace boost { namespace hana { namespace operators {
-    //! Equivalent to `mod`.
-    //! @relates boost::hana::IntegralDomain
-    template <typename X, typename Y, typename = detail::std::enable_if_t<
-        enable_operators<IntegralDomain, datatype_t<X>>::value ||
-        enable_operators<IntegralDomain, datatype_t<Y>>::value
-    >>
-    constexpr decltype(auto) operator%(X&& x, Y&& y)
-    { return mod(detail::std::forward<X>(x), detail::std::forward<Y>(y)); }
-
-    //! Equivalent to `quot`.
-    //! @relates boost::hana::IntegralDomain
-    template <typename X, typename Y, typename = detail::std::enable_if_t<
-        enable_operators<IntegralDomain, datatype_t<X>>::value ||
-        enable_operators<IntegralDomain, datatype_t<Y>>::value
-    >>
-    constexpr decltype(auto) operator/(X&& x, Y&& y)
-    { return quot(detail::std::forward<X>(x), detail::std::forward<Y>(y)); }
-}}} // end namespace boost::hana::operators
-
-#endif // !BOOST_HANA_INTEGRAL_DOMAIN_OPERATORS_HPP
diff --git a/include/boost/hana/iterable.hpp b/include/boost/hana/iterable.hpp
index 66a00d5ef..b0acb56c0 100644
--- a/include/boost/hana/iterable.hpp
+++ b/include/boost/hana/iterable.hpp
@@ -10,8 +10,182 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_ITERABLE_HPP
 #define BOOST_HANA_ITERABLE_HPP
 
-#include <boost/hana/iterable/iterable.hpp>
-#include <boost/hana/iterable/mcd.hpp>
-#include <boost/hana/iterable/operators.hpp>
+#include <boost/hana/fwd/iterable.hpp>
+
+#include <boost/hana/comparable.hpp>
+#include <boost/hana/core/is_a.hpp>
+#include <boost/hana/core/when.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+#include <boost/hana/enumerable.hpp>
+#include <boost/hana/integral.hpp>
+#include <boost/hana/logical.hpp>
+
+// provided instances
+#include <boost/hana/foldable.hpp>
+
+
+namespace boost { namespace hana {
+    namespace operators {
+        //! Inherit this to get an `operator[]` equivalent to `at`.
+        //! @relates boost::hana::Iterable
+        //!
+        //! @todo Find a proper way to provide member operators.
+        template <typename Derived>
+        struct Iterable_ops {
+            template <typename I>
+            constexpr decltype(auto) operator[](I&& i) const& {
+                return at(
+                    detail::std::forward<I>(i),
+                    static_cast<Derived const&>(*this)
+                );
+            }
+
+            template <typename I>
+            constexpr decltype(auto) operator[](I&& i) & {
+                return at(
+                    detail::std::forward<I>(i),
+                    static_cast<Derived&>(*this)
+                );
+            }
+
+            template <typename I>
+            constexpr decltype(auto) operator[](I&& i) const&& {
+                return at(
+                    detail::std::forward<I>(i),
+                    static_cast<Derived const&&>(*this)
+                );
+            }
+
+            template <typename I>
+            constexpr decltype(auto) operator[](I&& i) && {
+                return at(
+                    detail::std::forward<I>(i),
+                    static_cast<Derived&&>(*this)
+                );
+            }
+        };
+    }
+    //! Minimal complete definition: `head`, `tail` and `is_empty`
+    struct Iterable::mcd {
+        template <typename Index, typename Iterable_>
+        static constexpr auto at_impl(Index n, Iterable_ iterable) {
+            return eval_if(equal(n, size_t<0>),
+                [=](auto _) { return head(_(iterable)); },
+                [=](auto _) { return at_impl(_(pred)(n), tail(_(iterable))); }
+            );
+        }
+
+        template <typename Iterable_>
+        static constexpr auto last_impl(Iterable_ iterable) {
+            return eval_if(is_empty(tail(iterable)),
+                [=](auto _) { return head(_(iterable)); },
+                [=](auto _) { return last_impl(tail(_(iterable))); }
+            );
+        }
+
+        template <typename N, typename Iterable_>
+        static constexpr auto drop_impl(N n, Iterable_ iterable) {
+            return eval_if(or_(equal(n, size_t<0>), is_empty(iterable)),
+                [=](auto) { return iterable; },
+                [=](auto _) { return drop_impl(_(pred)(n), tail(_(iterable))); }
+            );
+        }
+
+        template <typename Xs, typename Pred>
+        static constexpr auto drop_while_impl(Xs xs, Pred pred) {
+            return eval_if(is_empty(xs),
+                [=](auto) { return xs; },
+                [=](auto _) {
+                    return eval_if(pred(_(head)(xs)),
+                        [=](auto _) { return drop_while_impl(_(tail)(xs), pred); },
+                        [=](auto) { return xs; }
+                    );
+                }
+            );
+        }
+
+        template <typename Xs, typename Pred>
+        static constexpr auto drop_until_impl(Xs xs, Pred pred) {
+            return drop_while(xs, [=](auto x) { return not_(pred(x)); });
+        }
+    };
+
+    //! Minimal complete definition: `Iterable`
+    //!
+    //! @todo Add perfect forwarding where possible. This is _not_ obvious
+    //! to me because of all those branches.
+    struct Foldable::iterable_mcd : Foldable::folds_mcd {
+        template <typename Xs, typename State, typename F>
+        static constexpr auto foldl_impl(Xs xs, State s, F f) {
+            return eval_if(is_empty(xs),
+                [=](auto) { return s; },
+                [=](auto _) {
+                    return foldl_impl(tail(_(xs)), f(s, head(_(xs))), f);
+                }
+            );
+        }
+
+        template <typename Xs, typename F>
+        static constexpr auto foldl1_impl(Xs xs, F f)
+        { return foldl(tail(xs), head(xs), f); }
+
+        template <typename Xs, typename F>
+        static constexpr auto foldr1_impl(Xs xs, F f) {
+            return eval_if(is_empty(tail(xs)),
+                [=](auto) { return head(xs); },
+                [=](auto _) {
+                    return f(head(xs), foldr1_impl(tail(_(xs)), f));
+                }
+            );
+        }
+
+        template <typename Xs, typename State, typename F>
+        static constexpr auto foldr_impl(Xs xs, State s, F f) {
+            return eval_if(is_empty(xs),
+                [=](auto) { return s; },
+                [=](auto _) {
+                    return f(head(_(xs)), foldr_impl(tail(_(xs)), s, f));
+                }
+            );
+        }
+    };
+
+    //! Every `Iterable` instance gives rise to an instance of `Foldable`,
+    //! which is valid for all finite such `Iterable`s.
+    //!
+    //! @details
+    //! Let `xs` be an `Iterable` and let `xi` denote its `i`-th element. In
+    //! other words, `xs` can be folded into a list containing `[x1, ..., xN]`,
+    //! where `N` is the number of elements. Right-folding `xs` with a binary
+    //! operation `*` (in infix notation for legibility) is equivalent to
+    //! @code
+    //!     x1 * (x2 * ( ... * (xN-1 * xN)))
+    //! @endcode
+    //!
+    //! Similarly, left-folding `xs` is equivalent to
+    //! @code
+    //!     (((x1 * x2) * x3) * ...) * xN
+    //! @endcode
+    //!
+    //! In both cases, notice the side of the parentheses. Left-folding
+    //! applies `*` in a left-associative manner, whereas right-folding
+    //! applies it in a right-associative manner. For associative operations,
+    //! i.e. operations such that for all `a`, `b` and `c`,
+    //! @code
+    //!     (a * b) * c = a * (b * c)
+    //! @endcode
+    //! this makes no difference. Also note that lazy folds and folds with an
+    //! initial state are implemented in an analogous way.
+    //!
+    //! ### Example 1
+    //! @snippet example/list/foldable.cpp foldl
+    //!
+    //! ### Example 2
+    //! @snippet example/integer_list/foldable.cpp foldr
+    template <typename T>
+    struct Foldable::instance<T, when<is_an<Iterable, T>()>>
+        : Foldable::iterable_mcd
+    { };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_ITERABLE_HPP
diff --git a/include/boost/hana/iterable/mcd.hpp b/include/boost/hana/iterable/mcd.hpp
deleted file mode 100644
index 1db1ca934..000000000
--- a/include/boost/hana/iterable/mcd.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Iterable::mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_ITERABLE_MCD_HPP
-#define BOOST_HANA_ITERABLE_MCD_HPP
-
-#include <boost/hana/iterable/iterable.hpp>
-
-#include <boost/hana/comparable/comparable.hpp>
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/group/group.hpp>
-#include <boost/hana/integral.hpp>
-#include <boost/hana/logical/logical.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition: `head`, `tail` and `is_empty`
-    struct Iterable::mcd {
-        template <typename Index, typename Iterable_>
-        static constexpr auto at_impl(Index n, Iterable_ iterable) {
-            return eval_if(equal(n, size_t<0>),
-                [=](auto _) { return head(_(iterable)); },
-                [=](auto _) { return at_impl(_(minus)(n, size_t<1>), tail(_(iterable))); }
-            );
-        }
-
-        template <typename Iterable_>
-        static constexpr auto last_impl(Iterable_ iterable) {
-            return eval_if(is_empty(tail(iterable)),
-                [=](auto _) { return head(_(iterable)); },
-                [=](auto _) { return last_impl(tail(_(iterable))); }
-            );
-        }
-
-        template <typename N, typename Iterable_>
-        static constexpr auto drop_impl(N n, Iterable_ iterable) {
-            return eval_if(or_(equal(n, size_t<0>), is_empty(iterable)),
-                [=](auto) { return iterable; },
-                [=](auto _) { return drop_impl(_(minus)(n, size_t<1>), tail(_(iterable))); }
-            );
-        }
-
-        template <typename Xs, typename Pred>
-        static constexpr auto drop_while_impl(Xs xs, Pred pred) {
-            return eval_if(is_empty(xs),
-                [=](auto) { return xs; },
-                [=](auto _) {
-                    return eval_if(pred(_(head)(xs)),
-                        [=](auto _) { return drop_while_impl(_(tail)(xs), pred); },
-                        [=](auto) { return xs; }
-                    );
-                }
-            );
-        }
-
-        template <typename Xs, typename Pred>
-        static constexpr auto drop_until_impl(Xs xs, Pred pred) {
-            return drop_while(xs, [=](auto x) { return not_(pred(x)); });
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_ITERABLE_MCD_HPP
diff --git a/include/boost/hana/iterable/operators.hpp b/include/boost/hana/iterable/operators.hpp
deleted file mode 100644
index c81639844..000000000
--- a/include/boost/hana/iterable/operators.hpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*!
-@file
-Defines custom operators for `boost::hana::Iterable`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_ITERABLE_OPERATORS_HPP
-#define BOOST_HANA_ITERABLE_OPERATORS_HPP
-
-#include <boost/hana/iterable/iterable.hpp>
-
-#include <boost/hana/detail/std/forward.hpp>
-
-
-namespace boost { namespace hana { namespace operators {
-    //! Inherit this to get an `operator[]` equivalent to `at`.
-    //! @relates boost::hana::Iterable
-    //!
-    //! @todo Find a proper way to provide member operators.
-    template <typename Derived>
-    struct Iterable_ops {
-        template <typename I>
-        constexpr decltype(auto) operator[](I&& i) const& {
-            return at(
-                detail::std::forward<I>(i),
-                static_cast<Derived const&>(*this)
-            );
-        }
-
-        template <typename I>
-        constexpr decltype(auto) operator[](I&& i) & {
-            return at(
-                detail::std::forward<I>(i),
-                static_cast<Derived&>(*this)
-            );
-        }
-
-        template <typename I>
-        constexpr decltype(auto) operator[](I&& i) const&& {
-            return at(
-                detail::std::forward<I>(i),
-                static_cast<Derived const&&>(*this)
-            );
-        }
-
-        template <typename I>
-        constexpr decltype(auto) operator[](I&& i) && {
-            return at(
-                detail::std::forward<I>(i),
-                static_cast<Derived&&>(*this)
-            );
-        }
-    };
-}}} // end namespace boost::hana::operators
-
-#endif // !BOOST_HANA_ITERABLE_OPERATORS_HPP
diff --git a/include/boost/hana/lazy.hpp b/include/boost/hana/lazy.hpp
index 399888c54..61ef5bc22 100644
--- a/include/boost/hana/lazy.hpp
+++ b/include/boost/hana/lazy.hpp
@@ -10,11 +10,75 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_LAZY_HPP
 #define BOOST_HANA_LAZY_HPP
 
-#include <boost/hana/lazy/lazy.hpp>
+#include <boost/hana/fwd/lazy.hpp>
 
-// Instances
-#include <boost/hana/lazy/functor.hpp>
-#include <boost/hana/lazy/applicative.hpp>
-#include <boost/hana/lazy/monad.hpp>
+// instances
+#include <boost/hana/applicative.hpp>
+#include <boost/hana/functor.hpp>
+#include <boost/hana/monad.hpp>
+
+
+namespace boost { namespace hana {
+    //! Instance of `Applicative` for `Lazy`.
+    //!
+    //! A normal value can be lifted into a lazy value by using `lift<Lazy>`.
+    //! A lazy function can be lazily applied to a lazy value by using `ap`.
+    template <>
+    struct Applicative::instance<Lazy> : Applicative::mcd {
+        template <typename X>
+        static constexpr auto lift_impl(X x) {
+            auto storage = [=](auto) { return x; };
+            return lazy_detail::lazy<decltype(storage)>{storage};
+        }
+
+        template <typename LF, typename LX>
+        static constexpr auto ap_impl(LF lf, LX lx) {
+            auto storage = [=](auto _) { return _(eval)(lf)(_(eval)(lx)); };
+            return lazy_detail::lazy<decltype(storage)>{storage};
+        }
+    };
+
+    //! Instance of `Functor` for `Lazy`.
+    //!
+    //! `fmap`ing a function to a lazy value returns the result of applying
+    //! the function as a lazy value.
+    //!
+    //! ### Example
+    //! @snippet example/lazy/functor.cpp fmap
+    template <>
+    struct Functor::instance<Lazy> : Functor::fmap_mcd {
+        template <typename LX, typename F>
+        static constexpr auto fmap_impl(LX lx, F f) {
+            auto storage = [=](auto _) { return f(_(eval)(lx)); };
+            return lazy_detail::lazy<decltype(storage)>{storage};
+        }
+    };
+
+    //! Instance of `Monad` for `Lazy`.
+    //!
+    //! The `Lazy` monad allows combining lazy computations into larger
+    //! lazy computations.
+    //!
+    //! ### Example
+    //! @snippet example/lazy/monad.cpp main
+    template <>
+    struct Monad::instance<Lazy> : Monad::flatten_mcd<Lazy> {
+        template <typename LLX>
+        static constexpr auto flatten_impl(LLX llx) {
+            auto storage = [=](auto _) {
+                return eval(_(eval)(llx));
+            };
+            return lazy_detail::lazy<decltype(storage)>{storage};
+        }
+
+        template <typename LX, typename F>
+        static constexpr auto bind_impl(LX lx, F f) {
+            auto storage = [=](auto _) {
+                return eval(f(_(eval)(lx)));
+            };
+            return lazy_detail::lazy<decltype(storage)>{storage};
+        }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_LAZY_HPP
diff --git a/include/boost/hana/lazy/applicative.hpp b/include/boost/hana/lazy/applicative.hpp
deleted file mode 100644
index b7e6922b6..000000000
--- a/include/boost/hana/lazy/applicative.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Applicative` for `boost::hana::Lazy`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_LAZY_APPLICATIVE_HPP
-#define BOOST_HANA_LAZY_APPLICATIVE_HPP
-
-#include <boost/hana/applicative/mcd.hpp>
-#include <boost/hana/lazy/lazy.hpp>
-
-// Mcd
-#include <boost/hana/lazy/functor.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Applicative` for `Lazy`.
-    //!
-    //! A normal value can be lifted into a lazy value by using `lift<Lazy>`.
-    //! A lazy function can be lazily applied to a lazy value by using `ap`.
-    template <>
-    struct Applicative::instance<Lazy> : Applicative::mcd {
-        template <typename X>
-        static constexpr auto lift_impl(X x) {
-            auto storage = [=](auto) { return x; };
-            return lazy_detail::lazy<decltype(storage)>{storage};
-        }
-
-        template <typename LF, typename LX>
-        static constexpr auto ap_impl(LF lf, LX lx) {
-            auto storage = [=](auto _) { return _(eval)(lf)(_(eval)(lx)); };
-            return lazy_detail::lazy<decltype(storage)>{storage};
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_LAZY_APPLICATIVE_HPP
diff --git a/include/boost/hana/lazy/functor.hpp b/include/boost/hana/lazy/functor.hpp
deleted file mode 100644
index 638034ed6..000000000
--- a/include/boost/hana/lazy/functor.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Functor` for `boost::hana::Lazy`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_LAZY_FUNCTOR_HPP
-#define BOOST_HANA_LAZY_FUNCTOR_HPP
-
-#include <boost/hana/functor/fmap_mcd.hpp>
-#include <boost/hana/lazy/lazy.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Functor` for `Lazy`.
-    //!
-    //! `fmap`ing a function to a lazy value returns the result of applying
-    //! the function as a lazy value.
-    //!
-    //! ### Example
-    //! @snippet example/lazy/functor.cpp fmap
-    template <>
-    struct Functor::instance<Lazy> : Functor::fmap_mcd {
-        template <typename LX, typename F>
-        static constexpr auto fmap_impl(LX lx, F f) {
-            auto storage = [=](auto _) { return f(_(eval)(lx)); };
-            return lazy_detail::lazy<decltype(storage)>{storage};
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_LAZY_FUNCTOR_HPP
diff --git a/include/boost/hana/lazy/monad.hpp b/include/boost/hana/lazy/monad.hpp
deleted file mode 100644
index b42eb3616..000000000
--- a/include/boost/hana/lazy/monad.hpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Monad` for `boost::hana::Lazy`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_LAZY_MONAD_HPP
-#define BOOST_HANA_LAZY_MONAD_HPP
-
-#include <boost/hana/lazy/lazy.hpp>
-#include <boost/hana/monad/flatten_mcd.hpp>
-
-// Mcd
-#include <boost/hana/lazy/applicative.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Monad` for `Lazy`.
-    //!
-    //! The `Lazy` monad allows combining lazy computations into larger
-    //! lazy computations.
-    //!
-    //! ### Example
-    //! @snippet example/lazy/monad.cpp main
-    template <>
-    struct Monad::instance<Lazy> : Monad::flatten_mcd<Lazy> {
-        template <typename LLX>
-        static constexpr auto flatten_impl(LLX llx) {
-            auto storage = [=](auto _) {
-                return eval(_(eval)(llx));
-            };
-            return lazy_detail::lazy<decltype(storage)>{storage};
-        }
-
-        template <typename LX, typename F>
-        static constexpr auto bind_impl(LX lx, F f) {
-            auto storage = [=](auto _) {
-                return eval(f(_(eval)(lx)));
-            };
-            return lazy_detail::lazy<decltype(storage)>{storage};
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_LAZY_MONAD_HPP
diff --git a/include/boost/hana/list.hpp b/include/boost/hana/list.hpp
index f210528c8..e065645a9 100644
--- a/include/boost/hana/list.hpp
+++ b/include/boost/hana/list.hpp
@@ -10,8 +10,544 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_LIST_HPP
 #define BOOST_HANA_LIST_HPP
 
-#include <boost/hana/list/convert.hpp>
-#include <boost/hana/list/list.hpp>
-#include <boost/hana/list/mcd.hpp>
+#include <boost/hana/fwd/list.hpp>
+
+#include <boost/hana/applicative.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/comparable.hpp>
+#include <boost/hana/constant.hpp>
+#include <boost/hana/core/convert.hpp>
+#include <boost/hana/core/is_a.hpp>
+#include <boost/hana/core/when.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+#include <boost/hana/detail/std/integer_sequence.hpp>
+#include <boost/hana/detail/variadic/foldr.hpp>
+#include <boost/hana/foldable.hpp>
+#include <boost/hana/functional/id.hpp>
+#include <boost/hana/functor.hpp>
+#include <boost/hana/group.hpp>
+#include <boost/hana/integral.hpp>
+#include <boost/hana/iterable.hpp>
+#include <boost/hana/logical.hpp>
+#include <boost/hana/maybe.hpp>
+#include <boost/hana/monad.hpp>
+#include <boost/hana/orderable.hpp>
+#include <boost/hana/pair.hpp>
+#include <boost/hana/product.hpp>
+
+// provided instances
+#include <boost/hana/comparable.hpp>
+#include <boost/hana/functor.hpp>
+#include <boost/hana/monad.hpp>
+#include <boost/hana/searchable.hpp>
+#include <boost/hana/traversable.hpp>
+
+
+namespace boost { namespace hana {
+    //! Minimal complete definition:
+    //! `Monad`, `Iterable`, `Foldable`, `cons`, and `nil`
+    template <typename L>
+    struct List::mcd {
+        template <typename Xs, typename Ys>
+        static constexpr auto concat_impl(Xs xs, Ys ys)
+        { return foldr(xs, ys, cons); }
+
+        template <typename Xs, typename Pred>
+        static constexpr auto filter_impl(Xs xs, Pred pred) {
+            auto go = [=](auto x, auto xs) {
+                return eval_if(pred(x),
+                    [=](auto _) { return _(cons)(x, xs); },
+                    [=](auto _) { return xs; }
+                );
+            };
+            return foldr(xs, nil<L>, go);
+        }
+
+        template <typename Pred, typename Xs>
+        static constexpr auto group_by_impl(Pred pred, Xs xs_) {
+            return eval_if(is_empty(xs_),
+                [](auto) { return nil<L>; },
+                [=](auto _) {
+                    auto x = _(head)(xs_);
+                    auto xs = _(tail)(xs_);
+                    auto ys_zs = span(xs, [=](auto y) { return pred(x, y); });
+                    auto ys = first(ys_zs);
+                    auto zs = second(ys_zs);
+                    return cons(cons(x, ys), group_by_impl(pred, zs));
+                }
+            );
+        }
+
+        template <typename Xs>
+        static constexpr auto group_impl(Xs xs) {
+            return group_by(equal, xs);
+        }
+
+        template <typename Xs>
+        static constexpr auto init_impl(Xs xs) {
+            return eval_if(is_empty(tail(xs)),
+                [](auto _) { return nil<L>; },
+                [=](auto _) { return cons(_(head)(xs), init_impl(_(tail)(xs))); }
+            );
+        }
+
+    private:
+        template <typename Prefix, typename Xs>
+        static constexpr decltype(auto) prepend_to_all(Prefix&& prefix, Xs&& xs) {
+            return foldr(detail::std::forward<Xs>(xs), nil<L>,
+                [pfx(detail::std::forward<Prefix>(prefix))](auto&& x, auto&& xs) -> decltype(auto) {
+                    return cons(pfx,
+                        cons(
+                            detail::std::forward<decltype(x)>(x),
+                            detail::std::forward<decltype(xs)>(xs)
+                        )
+                    );
+                }
+            );
+        }
+
+    public:
+        template <typename Xs, typename Z>
+        static constexpr decltype(auto) intersperse_impl(Xs&& xs, Z&& z) {
+            return eval_if(is_empty(xs),
+                [&xs](auto _) -> decltype(auto) {
+                    return id(detail::std::forward<Xs>(xs));
+                },
+                [&xs, &z](auto _) -> decltype(auto) {
+                    return cons(
+                        _(head)(xs),
+                        prepend_to_all(
+                            detail::std::forward<Z>(z),
+                            _(tail)(xs)
+                        )
+                    );
+                }
+            );
+        }
+
+        template <typename ...Xs>
+        static constexpr auto make_impl(Xs ...xs) {
+            return detail::variadic::foldr(cons, nil<L>, xs...);
+        }
+
+        template <typename Xs, typename Pred>
+        static constexpr auto partition_impl(Xs xs, Pred pred) {
+            auto go = [=](auto parts, auto x) {
+                return eval_if(pred(x),
+                    [=](auto _) { return pair(_(snoc)(first(parts), x), second(parts)); },
+                    [=](auto _) { return pair(first(parts), _(snoc)(second(parts), x)); }
+                );
+            };
+            return foldl(xs, pair(nil<L>, nil<L>), go);
+        }
+
+    private:
+        template <typename X, typename Xs>
+        static constexpr auto insertions(X x, Xs l) {
+            return eval_if(is_empty(l),
+                [=](auto _) { return lift<L>(lift<L>(x)); },
+                [=](auto _) {
+                    auto y = _(head)(l);
+                    auto ys = _(tail)(l);
+                    return cons(
+                        _(cons)(x, l),
+                        fmap(insertions(x, ys), [=](auto zs) {
+                            return cons(y, zs);
+                        })
+                    );
+                }
+            );
+        }
+
+    public:
+        template <typename Xs>
+        static constexpr auto permutations_impl(Xs xs) {
+            return eval_if(is_empty(xs),
+                [](auto _) { return lift<L>(nil<L>); },
+                [=](auto _) {
+                    return flatten(fmap(permutations_impl(_(tail)(xs)), [=](auto ys) {
+                        return insertions(_(head)(xs), ys);
+                    }));
+                }
+            );
+        }
+
+        template <typename X, int ...i>
+        static constexpr auto repeat_helper(X x, detail::std::integer_sequence<int, i...>) {
+            return make<L>(((void)i, void(), x)...);
+        }
+
+        template <typename N, typename X>
+        static constexpr auto repeat_impl(N n, X x) {
+            constexpr auto m = value(n);
+            return repeat_helper(x, detail::std::make_integer_sequence<int, m>{});
+        }
+
+        template <typename Xs>
+        static constexpr auto reverse_impl(Xs xs) {
+            return foldl(xs, nil<L>, [](auto xs, auto x) {
+                return cons(x, xs);
+            });
+        }
+
+        template <typename Xs, typename S, typename F>
+        static constexpr auto scanl_impl(Xs xs, S s, F f) {
+            return eval_if(is_empty(xs),
+                [=](auto _) { return lift<L>(s); },
+                [=](auto _) {
+                    return cons(s, scanl_impl(_(tail)(xs), f(s, _(head)(xs)), f));
+                }
+            );
+        }
+
+        template <typename Xs, typename F>
+        static constexpr auto scanl1_impl(Xs xs, F f) {
+            return eval_if(is_empty(xs),
+                [](auto _) { return nil<L>; },
+                [=](auto _) { return scanl(_(tail)(xs), _(head)(xs), f); }
+            );
+        }
+
+        template <typename Xs, typename S, typename F>
+        static constexpr auto scanr_impl(Xs xs, S s, F f) {
+            return eval_if(is_empty(xs),
+                [=](auto _) { return lift<L>(s); },
+                [=](auto _) {
+                    auto rest = scanr_impl(_(tail)(xs), s, f);
+                    return cons(f(_(head)(xs), head(rest)), rest);
+                }
+            );
+        }
+
+        template <typename Lst, typename F>
+        static constexpr auto scanr1_impl(Lst lst, F f) {
+            return eval_if(is_empty(lst),
+                [](auto _) { return nil<L>; },
+                [=](auto _) {
+                    auto x = _(head)(lst);
+                    auto xs = _(tail)(lst);
+                    return eval_if(is_empty(xs),
+                        [=](auto _) { return lift<L>(x); },
+                        [=](auto _) {
+                            auto rest = scanr1_impl(xs, _(f));
+                            return cons(f(x, head(rest)), rest);
+                        }
+                    );
+                }
+            );
+        }
+
+        template <typename Xs, typename From, typename To>
+        static constexpr auto slice_impl(Xs xs, From from, To to) {
+            return take(minus(to, from), drop(from, xs));
+        }
+
+        template <typename Xs, typename X>
+        static constexpr auto snoc_impl(Xs xs, X x) {
+            return foldr(xs, lift<L>(x), cons);
+        }
+
+        template <typename Xs>
+        static constexpr auto sort_impl(Xs xs) {
+            return sort_by(less, xs);
+        }
+
+        template <typename Pred, typename Xs>
+        static constexpr auto sort_by_impl(Pred pred, Xs xs) {
+            return eval_if(is_empty(xs),
+                [=](auto _) { return xs; },
+                [=](auto _) {
+                    return eval_if(is_empty(_(tail)(xs)),
+                        [=](auto _) { return xs; },
+                        [=](auto _) {
+                            auto pivot = _(head)(xs);
+                            auto rest = _(tail)(xs);
+                            auto parts = partition(rest, [=](auto x) { return pred(x, pivot); });
+                            return concat(
+                                sort_by_impl(pred, first(parts)),
+                                cons(pivot, sort_by_impl(pred, second(parts)))
+                            );
+                        }
+                    );
+                }
+            );
+        }
+
+        template <typename Xs, typename Pred>
+        static constexpr auto span_impl(Xs xs, Pred pred) {
+            return eval_if(is_empty(xs),
+                [=](auto _) { return pair(nil<L>, nil<L>); },
+                [=](auto _) {
+                    auto x = _(head)(xs);
+                    auto xs_ = _(tail)(xs);
+                    return eval_if(pred(x),
+                        [=](auto _) {
+                            auto ys_zs = span_impl(xs_, _(pred));
+                            auto ys = first(ys_zs);
+                            auto zs = second(ys_zs);
+                            return pair(cons(x, ys), zs);
+                        },
+                        [=](auto _) {
+                            return pair(nil<L>, xs);
+                        }
+                    );
+                }
+            );
+        }
+
+        template <typename N, typename Xs>
+        static constexpr auto take_impl(N n, Xs xs) {
+            return eval_if(or_(is_empty(xs), equal(n, int_<0>)),
+                [](auto _) { return nil<L>; },
+                [=](auto _) {
+                    return cons(_(head)(xs), take_impl(minus(n, int_<1>), _(tail)(xs)));
+                }
+            );
+        }
+
+        template <typename Xs, typename Pred>
+        static constexpr auto take_until_impl(Xs xs, Pred pred) {
+            return take_while(xs, [=](auto x) { return not_(pred(x)); });
+        }
+
+        template <typename Xs, typename Pred>
+        static constexpr auto take_while_impl(Xs xs, Pred pred) {
+            return eval_if(is_empty(xs),
+                [=](auto _) { return nil<L>; },
+                [=](auto _) {
+                    return eval_if(pred(_(head)(xs)),
+                        [=](auto _) {
+                            return cons(
+                                _(head)(xs),
+                                take_while_impl(_(tail)(xs), pred)
+                            );
+                        },
+                        [=](auto _) { return nil<L>; }
+                    );
+                }
+            );
+        }
+
+        template <typename F, typename Init>
+        static constexpr auto unfoldr_impl(F f, Init init) {
+            auto g = [=](auto a_b) {
+                return cons(first(a_b), unfoldr_impl(f, second(a_b)));
+            };
+            return maybe(nil<L>, g, f(init));
+        }
+
+        template <typename F, typename Init>
+        static constexpr auto unfoldl_impl(F f, Init init) {
+            auto g = [=](auto b_a) {
+                return snoc(unfoldl_impl(f, first(b_a)), second(b_a));
+            };
+            return maybe(nil<L>, g, f(init));
+        }
+
+        template <typename Xs>
+        static constexpr auto unzip_impl(Xs xs)
+        { return unpack(xs, zip); }
+
+        template <typename ...Xss>
+        static constexpr auto zip_impl(Xss ...xss)
+        { return zip_with(make<L>, xss...); }
+
+        template <typename F, typename ...Xss>
+        static constexpr auto zip_with_impl(F f, Xss ...xss) {
+            return eval_if(or_(is_empty(xss)...),
+                [](auto _) { return nil<L>; },
+                [=](auto _) {
+                    return cons(
+                        f(_(head)(xss)...),
+                        zip_with_impl(f, _(tail)(xss)...)
+                    );
+                }
+            );
+        }
+    };
+
+    //! Converts a `Foldable` to a `List`.
+    template <typename L, typename T>
+    struct convert<L, T, when<is_a<List, L>() && is_a<Foldable, T>()>> {
+        template <typename Xs>
+        static constexpr decltype(auto) apply(Xs&& xs)
+        { return foldr(detail::std::forward<Xs>(xs), nil<L>, cons); }
+    };
+
+    //! Minimal complete definition: `Functor` and `List`
+    template <typename T>
+    struct Applicative::list_mcd {
+        template <typename X>
+        static constexpr decltype(auto) lift_impl(X&& x)
+        { return cons(detail::std::forward<X>(x), nil<T>); }
+
+        template <typename Fs, typename Xs>
+        static constexpr decltype(auto) ap_impl(Fs&& fs, Xs&& xs) {
+            return bind(
+                detail::std::forward<Fs>(fs),
+                [xs(detail::std::forward<Xs>(xs))](auto&& f) -> decltype(auto) {
+                    return fmap(xs, detail::std::forward<decltype(f)>(f));
+                }
+            );
+        }
+    };
+
+    //! `Applicative` instance for instances of the `List` type class.
+    //!
+    //! A value can be lifted into a singleton list with `lift`. `ap(fs, xs)`
+    //! applies each function in the list `fs` to each value in the list `xs`,
+    //! and returns a list containing all the results.
+    //!
+    //! ### Example
+    //! @snippet example/list/applicative.cpp main
+    template <typename T>
+    struct Applicative::instance<T, when<is_a<List, T>()>>
+        : Applicative::list_mcd<T>
+    { };
+
+    //! Minimal complete definition: `List`
+    struct Comparable::list_mcd
+        : Comparable::equal_mcd
+    {
+        template <typename Xs, typename Ys>
+        static constexpr decltype(auto) equal_impl(Xs const& xs, Ys const& ys) {
+            return eval_if(or_(is_empty(xs), is_empty(ys)),
+                [&xs, &ys](auto _) -> decltype(auto) {
+                    return and_(_(is_empty)(xs), _(is_empty)(ys));
+                },
+                [&xs, &ys](auto _) -> decltype(auto) {
+                    return and_(equal(_(head)(xs), _(head)(ys)),
+                                equal_impl(_(tail)(xs), _(tail)(ys)));
+                }
+            );
+        }
+    };
+
+    //! Instance of `Comparable` for instances of `List`.
+    //!
+    //! Two `List`s are equal if and only if they contain the same number
+    //! of elements and their elements at any given index are equal.
+    //!
+    //! ### Example
+    //! @snippet example/list/comparable.cpp main
+    template <typename T, typename U>
+    struct Comparable::instance<T, U, when<
+        is_a<List, T>() && is_a<List, U>()
+    >>
+        : Comparable::list_mcd
+    { };
+
+    template <typename T>
+    struct Functor::list_mcd : Functor::fmap_mcd {
+        template <typename Xs, typename F>
+        static constexpr auto fmap_impl(Xs xs, F f) {
+            return foldr(xs, nil<T>, [=](auto x, auto xs) {
+                return cons(f(x), xs);
+            });
+        }
+    };
+
+    //! `Functor` instance for `List`s.
+    //!
+    //! `List`s implement `fmap` as the mapping of a function over each
+    //! element of the list, which is somewhat equivalent to `std::transform`.
+    //! Mapping a function over an empty list returns an empty list and never
+    //! applies the function.
+    //!
+    //! ### Example
+    //! @snippet example/list/functor.cpp fmap
+    template <typename T>
+    struct Functor::instance<T, when<is_a<List, T>()>>
+        : Functor::list_mcd<T>
+    { };
+
+    template <typename T>
+    struct Monad::list_mcd : Monad::flatten_mcd<T> {
+        template <typename Xss>
+        static constexpr decltype(auto) flatten_impl(Xss&& xss) {
+            return foldl(detail::std::forward<Xss>(xss), nil<T>, concat);
+        }
+    };
+
+    //! `Monad` instance for instances of the `List` type class.
+    //!
+    //! A function returning a list of results can be mapped over all the
+    //! elements of a list and have all the results concatenated using `bind`.
+    //! Also, a list of lists can be flattened one level with `flatten`.
+    //!
+    //! ### Example
+    //! @snippet example/list/monad.cpp main
+    template <typename T>
+    struct Monad::instance<T, when<is_a<List, T>()>>
+        : Monad::list_mcd<T>
+    { };
+
+    //! Minimal complete definition: `List`
+    //!
+    //! @todo
+    //! Use perfect forwarding once bug
+    //! http://llvm.org/bugs/show_bug.cgi?id=20619
+    //! is fixed.
+    struct Searchable::list_mcd : Searchable::mcd {
+        template <typename Xs, typename Pred>
+        static constexpr auto find_impl(Xs xs, Pred pred) {
+            auto e = drop_until(xs, pred);
+            return eval_if(is_empty(e),
+                [](auto) { return nothing; },
+                [=](auto _) { return just(_(head)(e)); }
+            );
+        }
+
+        template <typename Xs, typename Pred>
+        static constexpr auto any_impl(Xs xs, Pred pred) {
+            return eval_if(is_empty(xs),
+                [](auto _) { return false_; },
+                [=](auto _) {
+                    return eval_if(pred(_(head)(xs)),
+                        [=](auto _) { return true_; },
+                        [=](auto _) { return any_impl(_(tail)(xs), pred); }
+                    );
+                }
+            );
+        }
+    };
+
+    //! Instance of `Searchable` for `List`s.
+    //!
+    //! A `List` can be searched by doing a linear search in the elements,
+    //! with the keys and values being both the elements in the list.
+    //!
+    //! @todo
+    //! Technically, this can be implemented in `Iterable`. Should it?
+    //!
+    //! ### Example
+    //! @snippet example/list/searchable.cpp find
+    template <typename T>
+    struct Searchable::instance<T, when<is_a<List, T>()>>
+        : Searchable::list_mcd
+    { };
+
+    template <typename T>
+    struct Traversable::list_mcd : Traversable::traverse_mcd {
+        template <typename A, typename Xs, typename F>
+        static constexpr auto traverse_impl(Xs xs, F f) {
+            auto curried_cons = [](auto x) {
+                return [=](auto xs) { return cons(x, xs); };
+            };
+            return foldr(xs, lift<A>(nil<T>), [=](auto x, auto ys) {
+                return ap(fmap(f(x), curried_cons), ys);
+            });
+        }
+    };
+
+    //! `Traversable` instance for `List` instances.
+    //!
+    //! ### Example
+    //! @snippet example/list/traversable.cpp main
+    template <typename T>
+    struct Traversable::instance<T, when<is_a<List, T>()>>
+        : Traversable::list_mcd<T>
+    { };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_LIST_HPP
diff --git a/include/boost/hana/list/convert.hpp b/include/boost/hana/list/convert.hpp
deleted file mode 100644
index 0d0f02da6..000000000
--- a/include/boost/hana/list/convert.hpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/*!
-@file
-Defines the conversion from any `boost::hana::Foldable` to any `boost::hana::List`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_LIST_CONVERT_HPP
-#define BOOST_HANA_LIST_CONVERT_HPP
-
-#include <boost/hana/core/convert.hpp>
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/foldable/foldable.hpp>
-#include <boost/hana/list/list.hpp>
-
-
-namespace boost { namespace hana {
-    //! Converts a `Foldable` to a `List`.
-    template <typename L, typename T>
-    struct convert<L, T, when<is_a<List, L>() && is_a<Foldable, T>()>> {
-        template <typename Xs>
-        static constexpr decltype(auto) apply(Xs&& xs)
-        { return foldr(detail::std::forward<Xs>(xs), nil<L>, cons); }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_LIST_CONVERT_HPP
diff --git a/include/boost/hana/list/mcd.hpp b/include/boost/hana/list/mcd.hpp
deleted file mode 100644
index 9a600ef3f..000000000
--- a/include/boost/hana/list/mcd.hpp
+++ /dev/null
@@ -1,358 +0,0 @@
-/*!
-@file
-Defines `boost::hana::List::mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_LIST_MCD_HPP
-#define BOOST_HANA_LIST_MCD_HPP
-
-#include <boost/hana/applicative/applicative.hpp>
-#include <boost/hana/comparable/comparable.hpp>
-#include <boost/hana/constant/constant.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/detail/std/integer_sequence.hpp>
-#include <boost/hana/detail/variadic/foldr.hpp>
-#include <boost/hana/foldable/foldable.hpp>
-#include <boost/hana/functional/id.hpp>
-#include <boost/hana/functor/functor.hpp>
-#include <boost/hana/group/group.hpp>
-#include <boost/hana/integral.hpp>
-#include <boost/hana/iterable/iterable.hpp>
-#include <boost/hana/list/list.hpp>
-#include <boost/hana/logical/logical.hpp>
-#include <boost/hana/maybe.hpp>
-#include <boost/hana/monad/monad.hpp>
-#include <boost/hana/orderable/orderable.hpp>
-#include <boost/hana/pair.hpp>
-#include <boost/hana/product/product.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition:
-    //! `Monad`, `Iterable`, `Foldable`, `cons`, and `nil`
-    template <typename L>
-    struct List::mcd {
-        template <typename Xs, typename Ys>
-        static constexpr auto concat_impl(Xs xs, Ys ys)
-        { return foldr(xs, ys, cons); }
-
-        template <typename Xs, typename Pred>
-        static constexpr auto filter_impl(Xs xs, Pred pred) {
-            auto go = [=](auto x, auto xs) {
-                return eval_if(pred(x),
-                    [=](auto _) { return _(cons)(x, xs); },
-                    [=](auto _) { return xs; }
-                );
-            };
-            return foldr(xs, nil<L>, go);
-        }
-
-        template <typename Pred, typename Xs>
-        static constexpr auto group_by_impl(Pred pred, Xs xs_) {
-            return eval_if(is_empty(xs_),
-                [](auto) { return nil<L>; },
-                [=](auto _) {
-                    auto x = _(head)(xs_);
-                    auto xs = _(tail)(xs_);
-                    auto ys_zs = span(xs, [=](auto y) { return pred(x, y); });
-                    auto ys = first(ys_zs);
-                    auto zs = second(ys_zs);
-                    return cons(cons(x, ys), group_by_impl(pred, zs));
-                }
-            );
-        }
-
-        template <typename Xs>
-        static constexpr auto group_impl(Xs xs) {
-            return group_by(equal, xs);
-        }
-
-        template <typename Xs>
-        static constexpr auto init_impl(Xs xs) {
-            return eval_if(is_empty(tail(xs)),
-                [](auto _) { return nil<L>; },
-                [=](auto _) { return cons(_(head)(xs), init_impl(_(tail)(xs))); }
-            );
-        }
-
-    private:
-        template <typename Prefix, typename Xs>
-        static constexpr decltype(auto) prepend_to_all(Prefix&& prefix, Xs&& xs) {
-            return foldr(detail::std::forward<Xs>(xs), nil<L>,
-                [pfx(detail::std::forward<Prefix>(prefix))](auto&& x, auto&& xs) -> decltype(auto) {
-                    return cons(pfx,
-                        cons(
-                            detail::std::forward<decltype(x)>(x),
-                            detail::std::forward<decltype(xs)>(xs)
-                        )
-                    );
-                }
-            );
-        }
-
-    public:
-        template <typename Xs, typename Z>
-        static constexpr decltype(auto) intersperse_impl(Xs&& xs, Z&& z) {
-            return eval_if(is_empty(xs),
-                [&xs](auto _) -> decltype(auto) {
-                    return id(detail::std::forward<Xs>(xs));
-                },
-                [&xs, &z](auto _) -> decltype(auto) {
-                    return cons(
-                        _(head)(xs),
-                        prepend_to_all(
-                            detail::std::forward<Z>(z),
-                            _(tail)(xs)
-                        )
-                    );
-                }
-            );
-        }
-
-        template <typename ...Xs>
-        static constexpr auto make_impl(Xs ...xs) {
-            return detail::variadic::foldr(cons, nil<L>, xs...);
-        }
-
-        template <typename Xs, typename Pred>
-        static constexpr auto partition_impl(Xs xs, Pred pred) {
-            auto go = [=](auto parts, auto x) {
-                return eval_if(pred(x),
-                    [=](auto _) { return pair(_(snoc)(first(parts), x), second(parts)); },
-                    [=](auto _) { return pair(first(parts), _(snoc)(second(parts), x)); }
-                );
-            };
-            return foldl(xs, pair(nil<L>, nil<L>), go);
-        }
-
-    private:
-        template <typename X, typename Xs>
-        static constexpr auto insertions(X x, Xs l) {
-            return eval_if(is_empty(l),
-                [=](auto _) { return lift<L>(lift<L>(x)); },
-                [=](auto _) {
-                    auto y = _(head)(l);
-                    auto ys = _(tail)(l);
-                    return cons(
-                        _(cons)(x, l),
-                        fmap(insertions(x, ys), [=](auto zs) {
-                            return cons(y, zs);
-                        })
-                    );
-                }
-            );
-        }
-
-    public:
-        template <typename Xs>
-        static constexpr auto permutations_impl(Xs xs) {
-            return eval_if(is_empty(xs),
-                [](auto _) { return lift<L>(nil<L>); },
-                [=](auto _) {
-                    return flatten(fmap(permutations_impl(_(tail)(xs)), [=](auto ys) {
-                        return insertions(_(head)(xs), ys);
-                    }));
-                }
-            );
-        }
-
-        template <typename X, int ...i>
-        static constexpr auto repeat_helper(X x, detail::std::integer_sequence<int, i...>) {
-            return make<L>(((void)i, void(), x)...);
-        }
-
-        template <typename N, typename X>
-        static constexpr auto repeat_impl(N n, X x) {
-            constexpr auto m = value(n);
-            return repeat_helper(x, detail::std::make_integer_sequence<int, m>{});
-        }
-
-        template <typename Xs>
-        static constexpr auto reverse_impl(Xs xs) {
-            return foldl(xs, nil<L>, [](auto xs, auto x) {
-                return cons(x, xs);
-            });
-        }
-
-        template <typename Xs, typename S, typename F>
-        static constexpr auto scanl_impl(Xs xs, S s, F f) {
-            return eval_if(is_empty(xs),
-                [=](auto _) { return lift<L>(s); },
-                [=](auto _) {
-                    return cons(s, scanl_impl(_(tail)(xs), f(s, _(head)(xs)), f));
-                }
-            );
-        }
-
-        template <typename Xs, typename F>
-        static constexpr auto scanl1_impl(Xs xs, F f) {
-            return eval_if(is_empty(xs),
-                [](auto _) { return nil<L>; },
-                [=](auto _) { return scanl(_(tail)(xs), _(head)(xs), f); }
-            );
-        }
-
-        template <typename Xs, typename S, typename F>
-        static constexpr auto scanr_impl(Xs xs, S s, F f) {
-            return eval_if(is_empty(xs),
-                [=](auto _) { return lift<L>(s); },
-                [=](auto _) {
-                    auto rest = scanr_impl(_(tail)(xs), s, f);
-                    return cons(f(_(head)(xs), head(rest)), rest);
-                }
-            );
-        }
-
-        template <typename Lst, typename F>
-        static constexpr auto scanr1_impl(Lst lst, F f) {
-            return eval_if(is_empty(lst),
-                [](auto _) { return nil<L>; },
-                [=](auto _) {
-                    auto x = _(head)(lst);
-                    auto xs = _(tail)(lst);
-                    return eval_if(is_empty(xs),
-                        [=](auto _) { return lift<L>(x); },
-                        [=](auto _) {
-                            auto rest = scanr1_impl(xs, _(f));
-                            return cons(f(x, head(rest)), rest);
-                        }
-                    );
-                }
-            );
-        }
-
-        template <typename Xs, typename From, typename To>
-        static constexpr auto slice_impl(Xs xs, From from, To to) {
-            return take(minus(to, from), drop(from, xs));
-        }
-
-        template <typename Xs, typename X>
-        static constexpr auto snoc_impl(Xs xs, X x) {
-            return foldr(xs, lift<L>(x), cons);
-        }
-
-        template <typename Xs>
-        static constexpr auto sort_impl(Xs xs) {
-            return sort_by(less, xs);
-        }
-
-        template <typename Pred, typename Xs>
-        static constexpr auto sort_by_impl(Pred pred, Xs xs) {
-            return eval_if(is_empty(xs),
-                [=](auto _) { return xs; },
-                [=](auto _) {
-                    return eval_if(is_empty(_(tail)(xs)),
-                        [=](auto _) { return xs; },
-                        [=](auto _) {
-                            auto pivot = _(head)(xs);
-                            auto rest = _(tail)(xs);
-                            auto parts = partition(rest, [=](auto x) { return pred(x, pivot); });
-                            return concat(
-                                sort_by_impl(pred, first(parts)),
-                                cons(pivot, sort_by_impl(pred, second(parts)))
-                            );
-                        }
-                    );
-                }
-            );
-        }
-
-        template <typename Xs, typename Pred>
-        static constexpr auto span_impl(Xs xs, Pred pred) {
-            return eval_if(is_empty(xs),
-                [=](auto _) { return pair(nil<L>, nil<L>); },
-                [=](auto _) {
-                    auto x = _(head)(xs);
-                    auto xs_ = _(tail)(xs);
-                    return eval_if(pred(x),
-                        [=](auto _) {
-                            auto ys_zs = span_impl(xs_, _(pred));
-                            auto ys = first(ys_zs);
-                            auto zs = second(ys_zs);
-                            return pair(cons(x, ys), zs);
-                        },
-                        [=](auto _) {
-                            return pair(nil<L>, xs);
-                        }
-                    );
-                }
-            );
-        }
-
-        template <typename N, typename Xs>
-        static constexpr auto take_impl(N n, Xs xs) {
-            return eval_if(or_(is_empty(xs), equal(n, int_<0>)),
-                [](auto _) { return nil<L>; },
-                [=](auto _) {
-                    return cons(_(head)(xs), take_impl(minus(n, int_<1>), _(tail)(xs)));
-                }
-            );
-        }
-
-        template <typename Xs, typename Pred>
-        static constexpr auto take_until_impl(Xs xs, Pred pred) {
-            return take_while(xs, [=](auto x) { return not_(pred(x)); });
-        }
-
-        template <typename Xs, typename Pred>
-        static constexpr auto take_while_impl(Xs xs, Pred pred) {
-            return eval_if(is_empty(xs),
-                [=](auto _) { return nil<L>; },
-                [=](auto _) {
-                    return eval_if(pred(_(head)(xs)),
-                        [=](auto _) {
-                            return cons(
-                                _(head)(xs),
-                                take_while_impl(_(tail)(xs), pred)
-                            );
-                        },
-                        [=](auto _) { return nil<L>; }
-                    );
-                }
-            );
-        }
-
-        template <typename F, typename Init>
-        static constexpr auto unfoldr_impl(F f, Init init) {
-            auto g = [=](auto a_b) {
-                return cons(first(a_b), unfoldr_impl(f, second(a_b)));
-            };
-            return maybe(nil<L>, g, f(init));
-        }
-
-        template <typename F, typename Init>
-        static constexpr auto unfoldl_impl(F f, Init init) {
-            auto g = [=](auto b_a) {
-                return snoc(unfoldl_impl(f, first(b_a)), second(b_a));
-            };
-            return maybe(nil<L>, g, f(init));
-        }
-
-        template <typename Xs>
-        static constexpr auto unzip_impl(Xs xs)
-        { return unpack(xs, zip); }
-
-        template <typename ...Xss>
-        static constexpr auto zip_impl(Xss ...xss)
-        { return zip_with(make<L>, xss...); }
-
-        template <typename F, typename ...Xss>
-        static constexpr auto zip_with_impl(F f, Xss ...xss) {
-            return eval_if(or_(is_empty(xss)...),
-                [](auto _) { return nil<L>; },
-                [=](auto _) {
-                    return cons(
-                        f(_(head)(xss)...),
-                        zip_with_impl(f, _(tail)(xss)...)
-                    );
-                }
-            );
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_LIST_MCD_HPP
diff --git a/include/boost/hana/logical.hpp b/include/boost/hana/logical.hpp
index df46ce9e4..baacc9dd1 100644
--- a/include/boost/hana/logical.hpp
+++ b/include/boost/hana/logical.hpp
@@ -10,9 +10,70 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_LOGICAL_HPP
 #define BOOST_HANA_LOGICAL_HPP
 
-#include <boost/hana/logical/integral_constant_mcd.hpp>
-#include <boost/hana/logical/logical.hpp>
-#include <boost/hana/logical/mcd.hpp>
-#include <boost/hana/logical/operators.hpp>
+#include <boost/hana/fwd/logical.hpp>
+
+#include <boost/hana/core/datatype.hpp>
+#include <boost/hana/core/operators.hpp>
+#include <boost/hana/detail/std/enable_if.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+
+
+namespace boost { namespace hana {
+    //! Minimal complete definition: `eval_if` and `not_`
+    struct Logical::mcd {
+        template <typename X, typename Y>
+        static constexpr auto or_impl(X x, Y y)
+        { return if_(x, x, y); }
+
+        template <typename X, typename Y>
+        static constexpr auto and_impl(X x, Y y)
+        { return if_(x, y, x); }
+
+        template <typename C, typename T, typename E>
+        static constexpr auto if_impl(C c, T t, E e) {
+            return eval_if(c,
+                [=](auto) { return t; },
+                [=](auto) { return e; }
+            );
+        }
+    };
+
+    namespace operators {
+        //! Equivalent to `and_`.
+        //! @relates boost::hana::Logical
+        template <typename X, typename Y, typename = typename detail::std::enable_if<
+            enable_operators<Logical, datatype_t<X>>::value ||
+            enable_operators<Logical, datatype_t<Y>>::value
+        >::type>
+        constexpr decltype(auto) operator&&(X&& x, Y&& y) {
+            return and_(
+                detail::std::forward<X>(x),
+                detail::std::forward<Y>(y)
+            );
+        }
+
+        //! Equivalent to `or_`.
+        //! @relates boost::hana::Logical
+        template <typename X, typename Y, typename = typename detail::std::enable_if<
+            enable_operators<Logical, datatype_t<X>>::value ||
+            enable_operators<Logical, datatype_t<Y>>::value
+        >::type>
+        constexpr decltype(auto) operator||(X&& x, Y&& y) {
+            return or_(
+                detail::std::forward<X>(x),
+                detail::std::forward<Y>(y)
+            );
+        }
+
+        //! Equivalent to `not_`.
+        //! @relates boost::hana::Logical
+        template <typename X, typename = typename detail::std::enable_if<
+            enable_operators<Logical, datatype_t<X>>::value
+        >::type>
+        constexpr decltype(auto) operator!(X&& x) {
+            return not_(detail::std::forward<X>(x));
+        }
+    }
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_LOGICAL_HPP
diff --git a/include/boost/hana/logical/integral_constant_mcd.hpp b/include/boost/hana/logical/integral_constant_mcd.hpp
deleted file mode 100644
index f5f018432..000000000
--- a/include/boost/hana/logical/integral_constant_mcd.hpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Logical::integral_constant_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_LOGICAL_INTEGRAL_CONSTANT_MCD_HPP
-#define BOOST_HANA_LOGICAL_INTEGRAL_CONSTANT_MCD_HPP
-
-#include <boost/hana/constant/constant.hpp>
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/integral_constant/integral_constant.hpp>
-#include <boost/hana/logical/mcd.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Logical` for `IntegralConstant`s.
-    //!
-    //! An `IntegralConstant` is true-valued if and only if its integral
-    //! value is true-valued, i.e. if
-    //! @code
-    //!     static_cast<bool>(value(n)) == true
-    //! @endcode
-    template <typename I>
-    struct Logical::integral_constant_mcd : Logical::mcd {
-        template <bool> struct tval { };
-
-        template <typename Then, typename Else>
-        static constexpr auto eval_if_impl(tval<true>, Then t, Else e)
-        { return t([](auto x) { return x; }); }
-
-        template <typename Then, typename Else>
-        static constexpr auto eval_if_impl(tval<false>, Then t, Else e)
-        { return e([](auto x) { return x; }); }
-
-        template <typename Cond, typename Then, typename Else>
-        static constexpr auto eval_if_impl(Cond c, Then t, Else e)
-        { return eval_if_impl(tval<static_cast<bool>(value(c))>{}, t, e); }
-
-        template <typename Cond>
-        static constexpr auto not_impl(Cond c) {
-            constexpr auto nc = !value(c);
-            return integral_constant<I, decltype(nc), nc>;
-        }
-    };
-
-    template <typename I>
-    struct Logical::instance<I, when<is_an<IntegralConstant, I>()>>
-        : Logical::integral_constant_mcd<I>
-    { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_LOGICAL_INTEGRAL_CONSTANT_MCD_HPP
diff --git a/include/boost/hana/logical/mcd.hpp b/include/boost/hana/logical/mcd.hpp
deleted file mode 100644
index a46a919e1..000000000
--- a/include/boost/hana/logical/mcd.hpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Logical::mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_LOGICAL_MCD_HPP
-#define BOOST_HANA_LOGICAL_MCD_HPP
-
-#include <boost/hana/logical/logical.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition: `eval_if` and `not_`
-    struct Logical::mcd {
-        template <typename X, typename Y>
-        static constexpr auto or_impl(X x, Y y)
-        { return if_(x, x, y); }
-
-        template <typename X, typename Y>
-        static constexpr auto and_impl(X x, Y y)
-        { return if_(x, y, x); }
-
-        template <typename C, typename T, typename E>
-        static constexpr auto if_impl(C c, T t, E e) {
-            return eval_if(c,
-                [=](auto) { return t; },
-                [=](auto) { return e; }
-            );
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_LOGICAL_MCD_HPP
diff --git a/include/boost/hana/logical/operators.hpp b/include/boost/hana/logical/operators.hpp
deleted file mode 100644
index 0ae7b23f3..000000000
--- a/include/boost/hana/logical/operators.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*!
-@file
-Defines custom operators for `boost::hana::Logical`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_LOGICAL_OPERATORS_HPP
-#define BOOST_HANA_LOGICAL_OPERATORS_HPP
-
-#include <boost/hana/logical/logical.hpp>
-
-#include <boost/hana/core/datatype.hpp>
-#include <boost/hana/core/operators.hpp>
-#include <boost/hana/detail/std/enable_if.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-
-
-namespace boost { namespace hana { namespace operators {
-    //! Equivalent to `and_`.
-    //! @relates boost::hana::Logical
-    template <typename X, typename Y, typename = detail::std::enable_if_t<
-        enable_operators<Logical, datatype_t<X>>::value ||
-        enable_operators<Logical, datatype_t<Y>>::value
-    >>
-    constexpr decltype(auto) operator&&(X&& x, Y&& y) {
-        return and_(
-            detail::std::forward<X>(x),
-            detail::std::forward<Y>(y)
-        );
-    }
-
-    //! Equivalent to `or_`.
-    //! @relates boost::hana::Logical
-    template <typename X, typename Y, typename = detail::std::enable_if_t<
-        enable_operators<Logical, datatype_t<X>>::value ||
-        enable_operators<Logical, datatype_t<Y>>::value
-    >>
-    constexpr decltype(auto) operator||(X&& x, Y&& y) {
-        return or_(
-            detail::std::forward<X>(x),
-            detail::std::forward<Y>(y)
-        );
-    }
-
-    //! Equivalent to `not_`.
-    //! @relates boost::hana::Logical
-    template <typename X, typename = detail::std::enable_if_t<
-        enable_operators<Logical, datatype_t<X>>::value
-    >>
-    constexpr decltype(auto) operator!(X&& x) {
-        return not_(detail::std::forward<X>(x));
-    }
-}}} // end namespace boost::hana::operators
-
-#endif // !BOOST_HANA_LOGICAL_OPERATORS_HPP
diff --git a/include/boost/hana/map.hpp b/include/boost/hana/map.hpp
index b7a1c9652..33f85adc1 100644
--- a/include/boost/hana/map.hpp
+++ b/include/boost/hana/map.hpp
@@ -10,11 +10,108 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_MAP_HPP
 #define BOOST_HANA_MAP_HPP
 
-#include <boost/hana/map/map.hpp>
-#include <boost/hana/map/convert.hpp>
+#include <boost/hana/fwd/map.hpp>
 
-// Instances
-#include <boost/hana/map/comparable.hpp>
-#include <boost/hana/map/searchable.hpp>
+#include <boost/hana/core/convert.hpp>
+#include <boost/hana/core/datatype.hpp>
+#include <boost/hana/core/is_a.hpp>
+#include <boost/hana/core/when.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+#include <boost/hana/detail/std/move.hpp>
+#include <boost/hana/foldable.hpp>
+#include <boost/hana/functor.hpp>
+#include <boost/hana/logical.hpp>
+#include <boost/hana/product.hpp>
+#include <boost/hana/record.hpp>
+
+// instances
+#include <boost/hana/comparable.hpp>
+#include <boost/hana/searchable.hpp>
+
+
+namespace boost { namespace hana {
+    //! Two maps are equal iff all their keys are equal and are associated
+    //! to equal values.
+    //!
+    //! ### Example
+    //! @snippet example/map.cpp comparable
+    template <>
+    struct Comparable::instance<Map, Map> : Comparable::equal_mcd {
+        template <typename M1, typename M2>
+        static constexpr auto equal_impl(M1 m1, M2 m2) {
+            return and_(
+                equal(length(m1.storage), length(m2.storage)),
+                all(keys(m1), [=](auto k) {
+                    return equal(lookup(m1, k), lookup(m2, k));
+                })
+            );
+        }
+    };
+
+    //! Converting a `Record` `R` to a `Map` is equivalent to converting its
+    //! `members<R>` to a `Map`, except the values are replaced by the actual
+    //! members of the object instead of accessors.
+    template <typename R>
+    struct convert<Map, R, when<is_a<Record, R>()>> {
+        template <typename X>
+        static constexpr decltype(auto) apply(X&& x) {
+            auto extract = [x(detail::std::forward<X>(x))](auto&& member) -> decltype(auto) {
+                using P = datatype_t<decltype(member)>;
+                return make<P>(
+                    first(detail::std::forward<decltype(member)>(member)),
+                    second(detail::std::forward<decltype(member)>(member))(x)
+                );
+            };
+            return to<Map>(fmap(members<R>, detail::std::move(extract)));
+        }
+    };
+
+    //! Converts a `Foldable` of `Product`s to a `Map`.
+    //! @relates Map
+    //!
+    //! @note
+    //! The foldable structure must not contain duplicate keys.
+    //!
+    //! @todo
+    //! We should allow duplicate keys, with a documented policy (e.g. we
+    //! keep the last one).
+    template <typename F>
+    struct convert<Map, F, when<is_a<Foldable, F>() && !is_a<Record, F>()>> {
+        template <typename Xs>
+        static constexpr decltype(auto) apply(Xs&& xs)
+        { return unpack(detail::std::forward<Xs>(xs), map); }
+    };
+
+    //! Converts a `Map` to a `List` of `Product`s.
+    //! @relates Map
+    template <typename L>
+    struct convert<L, Map, when<is_a<List, L>()>> {
+        template <typename M>
+        static constexpr decltype(auto) apply(M&& m)
+        { return to<L>(detail::std::forward<M>(m).storage); }
+    };
+
+    //! A map can be searched by its keys with a predicate yielding a
+    //! [compile-time](@ref Logical_terminology) `Logical`.
+    //!
+    //! ### Example
+    //! @snippet example/map.cpp searchable
+    template <>
+    struct Searchable::instance<Map> : Searchable::mcd {
+        template <typename M, typename Pred>
+        static constexpr auto find_impl(M map, Pred pred) {
+            return fmap(
+                find(map.storage, [=](auto p) {
+                    return pred(first(p));
+                }),
+                second
+            );
+        }
+
+        template <typename M, typename Pred>
+        static constexpr auto any_impl(M map, Pred pred)
+        { return any(keys(map), pred); }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_MAP_HPP
diff --git a/include/boost/hana/map/comparable.hpp b/include/boost/hana/map/comparable.hpp
deleted file mode 100644
index 2a0ec655c..000000000
--- a/include/boost/hana/map/comparable.hpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Comparable` for `boost::hana::Map`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_MAP_COMPARABLE_HPP
-#define BOOST_HANA_MAP_COMPARABLE_HPP
-
-#include <boost/hana/comparable/equal_mcd.hpp>
-#include <boost/hana/foldable/foldable.hpp>
-#include <boost/hana/logical/logical.hpp>
-#include <boost/hana/map/map.hpp>
-#include <boost/hana/map/searchable.hpp>
-
-
-namespace boost { namespace hana {
-    //! Two maps are equal iff all their keys are equal and are associated
-    //! to equal values.
-    //!
-    //! ### Example
-    //! @snippet example/map.cpp comparable
-    template <>
-    struct Comparable::instance<Map, Map> : Comparable::equal_mcd {
-        template <typename M1, typename M2>
-        static constexpr auto equal_impl(M1 m1, M2 m2) {
-            return and_(
-                equal(length(m1.storage), length(m2.storage)),
-                all(keys(m1), [=](auto k) {
-                    return equal(lookup(m1, k), lookup(m2, k));
-                })
-            );
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_MAP_COMPARABLE_HPP
diff --git a/include/boost/hana/map/convert.hpp b/include/boost/hana/map/convert.hpp
deleted file mode 100644
index 6c70f6a1b..000000000
--- a/include/boost/hana/map/convert.hpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*!
-@file
-Defines conversions to and from a `boost::hana::Map`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_MAP_CONVERT_HPP
-#define BOOST_HANA_MAP_CONVERT_HPP
-
-#include <boost/hana/core/convert.hpp>
-#include <boost/hana/core/datatype.hpp>
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/detail/std/move.hpp>
-#include <boost/hana/foldable/foldable.hpp>
-#include <boost/hana/functor/functor.hpp>
-#include <boost/hana/map/map.hpp>
-#include <boost/hana/product/product.hpp>
-#include <boost/hana/record/record.hpp>
-
-
-namespace boost { namespace hana {
-    //! Converting a `Record` `R` to a `Map` is equivalent to converting its
-    //! `members<R>` to a `Map`, except the values are replaced by the actual
-    //! members of the object instead of accessors.
-    template <typename R>
-    struct convert<Map, R, when<is_a<Record, R>()>> {
-        template <typename X>
-        static constexpr decltype(auto) apply(X&& x) {
-            auto extract = [x(detail::std::forward<X>(x))](auto&& member) -> decltype(auto) {
-                using P = datatype_t<decltype(member)>;
-                return make<P>(
-                    first(detail::std::forward<decltype(member)>(member)),
-                    second(detail::std::forward<decltype(member)>(member))(x)
-                );
-            };
-            return to<Map>(fmap(members<R>, detail::std::move(extract)));
-        }
-    };
-
-    //! Converts a `Foldable` of `Product`s to a `Map`.
-    //! @relates Map
-    //!
-    //! @note
-    //! The foldable structure must not contain duplicate keys.
-    //!
-    //! @todo
-    //! We should allow duplicate keys, with a documented policy (e.g. we
-    //! keep the last one).
-    template <typename F>
-    struct convert<Map, F, when<is_a<Foldable, F>() && !is_a<Record, F>()>> {
-        template <typename Xs>
-        static constexpr decltype(auto) apply(Xs&& xs)
-        { return unpack(detail::std::forward<Xs>(xs), map); }
-    };
-
-    //! Converts a `Map` to a `List` of `Product`s.
-    //! @relates Map
-    template <typename L>
-    struct convert<L, Map, when<is_a<List, L>()>> {
-        template <typename M>
-        static constexpr decltype(auto) apply(M&& m)
-        { return to<L>(detail::std::forward<M>(m).storage); }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_MAP_CONVERT_HPP
diff --git a/include/boost/hana/map/searchable.hpp b/include/boost/hana/map/searchable.hpp
deleted file mode 100644
index c693a1a74..000000000
--- a/include/boost/hana/map/searchable.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Searchable` for `boost::hana::Map`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_MAP_SEARCHABLE_HPP
-#define BOOST_HANA_MAP_SEARCHABLE_HPP
-
-#include <boost/hana/functor/functor.hpp>
-#include <boost/hana/map/map.hpp>
-#include <boost/hana/product/product.hpp>
-#include <boost/hana/searchable/mcd.hpp>
-
-
-namespace boost { namespace hana {
-    //! A map can be searched by its keys with a predicate yielding a
-    //! [compile-time](@ref Logical_terminology) `Logical`.
-    //!
-    //! ### Example
-    //! @snippet example/map.cpp searchable
-    template <>
-    struct Searchable::instance<Map> : Searchable::mcd {
-        template <typename M, typename Pred>
-        static constexpr auto find_impl(M map, Pred pred) {
-            return fmap(
-                find(map.storage, [=](auto p) {
-                    return pred(first(p));
-                }),
-                second
-            );
-        }
-
-        template <typename M, typename Pred>
-        static constexpr auto any_impl(M map, Pred pred)
-        { return any(keys(map), pred); }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_MAP_SEARCHABLE_HPP
diff --git a/include/boost/hana/maybe.hpp b/include/boost/hana/maybe.hpp
index e97e19229..9e756045e 100644
--- a/include/boost/hana/maybe.hpp
+++ b/include/boost/hana/maybe.hpp
@@ -10,17 +10,223 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_MAYBE_HPP
 #define BOOST_HANA_MAYBE_HPP
 
-#include <boost/hana/maybe/maybe.hpp>
+#include <boost/hana/fwd/maybe.hpp>
 
-// Instances
-#include <boost/hana/maybe/functor.hpp>
-#include <boost/hana/maybe/applicative.hpp>
-#include <boost/hana/maybe/monad.hpp>
+#include <boost/hana/applicative.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+#include <boost/hana/functional/compose.hpp>
+#include <boost/hana/functional/id.hpp>
+#include <boost/hana/functor.hpp>
+#include <boost/hana/logical.hpp>
 
-#include <boost/hana/maybe/comparable.hpp>
+// instances
+#include <boost/hana/applicative.hpp>
+#include <boost/hana/comparable.hpp>
+#include <boost/hana/foldable.hpp>
+#include <boost/hana/functor.hpp>
+#include <boost/hana/monad.hpp>
+#include <boost/hana/searchable.hpp>
+#include <boost/hana/traversable.hpp>
 
-#include <boost/hana/maybe/foldable.hpp>
-#include <boost/hana/maybe/searchable.hpp>
-#include <boost/hana/maybe/traversable.hpp>
+
+namespace boost { namespace hana {
+    //! Instance of `Comparable` for `Maybe`s.
+    //!
+    //! Two `Maybe`s are equal if and only if they are both empty or they
+    //! both contain a value and those values are equal.
+    //!
+    //! ### Example
+    //! @snippet example/maybe/comparable.cpp main
+    template <>
+    struct Comparable::instance<Maybe, Maybe> : Comparable::equal_mcd {
+        template <typename T, typename U>
+        static constexpr decltype(auto)
+        equal_impl(maybe_detail::just<T> const& t, maybe_detail::just<U> const& u)
+        { return equal(t.val, u.val); }
+
+        template <bool tv, typename T, bool uv, typename U>
+        static constexpr auto
+        equal_impl(maybe_detail::maybe<tv, T> const&,
+                   maybe_detail::maybe<uv, U> const&)
+        { return bool_<tv == uv>; }
+    };
+
+    //! Instance of `Functor` for `Maybe`s.
+    //!
+    //! A `Maybe` can be seen as a `List` containing either one element
+    //! (`just(x)`) or no elements at all (`nothing`). As such, `fmap` for
+    //! `Maybe`s returns `nothing` when applied to `nothing` and `just(f(x))`
+    //! when applied to `just(x)`.
+    //!
+    //! ### Example
+    //! @snippet example/maybe/functor.cpp main
+    template <>
+    struct Functor::instance<Maybe> : Functor::fmap_mcd {
+        template <typename M, typename F>
+        static constexpr decltype(auto) fmap_impl(M&& m, F&& f) {
+            return maybe(
+                nothing,
+                compose(just, detail::std::forward<F>(f)),
+                detail::std::forward<M>(m)
+            );
+        }
+    };
+
+    //! Instance of `Applicative` for `Maybe`s.
+    //!
+    //! First, a value can be made optional with `lift<Maybe>`, which is
+    //! equivalent to `just`. Second, one can feed an optional value to an
+    //! optional function with `ap`, which will return `just(f(x))` if there
+    //! is both a function _and_ a value, and `nothing` otherwise.
+    //!
+    //! ### Example
+    //! @snippet example/maybe/applicative_simple.cpp main
+    //!
+    //! ### Example
+    //! @include example/maybe/applicative.cpp
+    template <>
+    struct Applicative::instance<Maybe> : Applicative::mcd {
+        template <typename X>
+        static constexpr decltype(auto) lift_impl(X&& x)
+        { return just(detail::std::forward<X>(x)); }
+
+        template <typename Mf, typename Mx>
+        static constexpr decltype(auto) ap_impl(Mf&& mf, Mx&& mx) {
+            return maybe(
+                nothing,
+                [&mx](auto&& f) -> decltype(auto) {
+                    return fmap(
+                        detail::std::forward<Mx>(mx),
+                        detail::std::forward<decltype(f)>(f)
+                    );
+                },
+                detail::std::forward<Mf>(mf)
+            );
+        }
+    };
+
+    //! Instance of `Monad` for `Maybe`s.
+    //!
+    //! The `Maybe` `Monad` makes it easy to compose actions that might fail.
+    //! One can feed an optional value if there is one into a function with
+    //! `bind`, which will return `nothing` if there is no value. Finally,
+    //! optional-optional values can have their redundant level of
+    //! `Maybe`ness removed with `flatten`.
+    //!
+    //! ### Example
+    //! @include example/maybe/monad.cpp
+    template <>
+    struct Monad::instance<Maybe> : Monad::flatten_mcd<Maybe> {
+        template <typename MMX>
+        static constexpr decltype(auto) flatten_impl(MMX&& mmx) {
+            return maybe(nothing, id, detail::std::forward<MMX>(mmx));
+        }
+    };
+
+    //! Instance of `Traversable` for `Maybe`s.
+    //!
+    //! Traversing `nothing` yields `nothing` in the new applicative, and
+    //! traversing `just(x)` applies the function and maps `just` inside
+    //! the resulting applicative.
+    //!
+    //! ### Example
+    //! @snippet example/maybe/traversable.cpp main
+    template <>
+    struct Traversable::instance<Maybe> : Traversable::traverse_mcd {
+        template <typename A, typename Mx, typename F>
+        static constexpr decltype(auto) traverse_impl(Mx&& mx, F&& f) {
+            return maybe(
+                lift<A>(nothing),
+                [&f](auto&& x) -> decltype(auto) {
+                    return fmap(
+                        detail::std::forward<F>(f)(
+                            detail::std::forward<decltype(x)>(x)
+                        ),
+                        just
+                    );
+                },
+                detail::std::forward<Mx>(mx)
+            );
+        }
+    };
+
+    //! Instance of `Foldable` for `Maybe`s.
+    //!
+    //! Folding a `Maybe` is equivalent to folding a `List` containing either
+    //! no elements (for `nothing`) or `x` (for `just(x)`). The `Foldable`
+    //! instance follows from that.
+    //!
+    //! ### Example
+    //! @snippet example/maybe/foldable.cpp main
+    template <>
+    struct Foldable::instance<Maybe>
+        : Foldable::folds_mcd
+    {
+        template <typename M, typename S, typename F>
+        static constexpr decltype(auto) foldr_impl(M&& m, S&& s, F&& f) {
+            // While it _seems_ like we're forwarding `s` twice, `s` may be
+            // moved from in only the branch which is actually executed.
+            return maybe(
+                detail::std::forward<S>(s),
+                [&f, &s](auto&& x) -> decltype(auto) {
+                    return detail::std::forward<F>(f)(
+                        detail::std::forward<decltype(x)>(x),
+                        detail::std::forward<S>(s)
+                    );
+                },
+                detail::std::forward<M>(m)
+            );
+        }
+
+        template <typename M, typename S, typename F>
+        static constexpr decltype(auto) foldl_impl(M&& m, S&& s, F&& f) {
+            // The same comment as above applies for the forwarding of `s`.
+            return maybe(
+                detail::std::forward<S>(s),
+                [&f, &s](auto&& x) -> decltype(auto) {
+                    return detail::std::forward<F>(f)(
+                        detail::std::forward<S>(s),
+                        detail::std::forward<decltype(x)>(x)
+                    );
+                },
+                detail::std::forward<M>(m)
+            );
+        }
+    };
+
+    //! Instance of `Searchable` for `Maybe`s.
+    //!
+    //! Searching a `Maybe` is equivalent to searching a list containing
+    //! `x` for `just(x)` and an empty list for `nothing`.
+    //!
+    //! ### Example
+    //! @snippet example/maybe/searchable.cpp main
+    template <>
+    struct Searchable::instance<Maybe> : Searchable::mcd {
+        template <typename M, typename Pred>
+        static constexpr decltype(auto) find_impl(M&& m, Pred&& p) {
+            return maybe(nothing,
+                [&p](auto&& x) -> decltype(auto) {
+                    return eval_if(detail::std::forward<Pred>(p)(x),
+                        [&x](auto _) -> decltype(auto) {
+                            return just(detail::std::forward<decltype(x)>(x));
+                        },
+                        [](auto) { return nothing; }
+                    );
+                },
+                detail::std::forward<M>(m)
+            );
+        }
+
+        template <typename M, typename Pred>
+        static constexpr decltype(auto) any_impl(M&& m, Pred&& p) {
+            return maybe(false_,
+                detail::std::forward<Pred>(p),
+                detail::std::forward<M>(m)
+            );
+        }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_MAYBE_HPP
diff --git a/include/boost/hana/maybe/applicative.hpp b/include/boost/hana/maybe/applicative.hpp
deleted file mode 100644
index b50cacc22..000000000
--- a/include/boost/hana/maybe/applicative.hpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Applicative` for `boost::hana::Maybe`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_MAYBE_APPLICATIVE_HPP
-#define BOOST_HANA_MAYBE_APPLICATIVE_HPP
-
-#include <boost/hana/applicative/mcd.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/functor/functor.hpp>
-#include <boost/hana/maybe/maybe.hpp>
-
-// Mcd
-#include <boost/hana/maybe/functor.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Applicative` for `Maybe`s.
-    //!
-    //! First, a value can be made optional with `lift<Maybe>`, which is
-    //! equivalent to `just`. Second, one can feed an optional value to an
-    //! optional function with `ap`, which will return `just(f(x))` if there
-    //! is both a function _and_ a value, and `nothing` otherwise.
-    //!
-    //! ### Example
-    //! @snippet example/maybe/applicative_simple.cpp main
-    //!
-    //! ### Example
-    //! @include example/maybe/applicative.cpp
-    template <>
-    struct Applicative::instance<Maybe> : Applicative::mcd {
-        template <typename X>
-        static constexpr decltype(auto) lift_impl(X&& x)
-        { return just(detail::std::forward<X>(x)); }
-
-        template <typename Mf, typename Mx>
-        static constexpr decltype(auto) ap_impl(Mf&& mf, Mx&& mx) {
-            return maybe(
-                nothing,
-                [&mx](auto&& f) -> decltype(auto) {
-                    return fmap(
-                        detail::std::forward<Mx>(mx),
-                        detail::std::forward<decltype(f)>(f)
-                    );
-                },
-                detail::std::forward<Mf>(mf)
-            );
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_MAYBE_APPLICATIVE_HPP
diff --git a/include/boost/hana/maybe/comparable.hpp b/include/boost/hana/maybe/comparable.hpp
deleted file mode 100644
index 6ac337642..000000000
--- a/include/boost/hana/maybe/comparable.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Comparable` for `boost::hana::Maybe`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_MAYBE_COMPARABLE_HPP
-#define BOOST_HANA_MAYBE_COMPARABLE_HPP
-
-#include <boost/hana/bool.hpp>
-#include <boost/hana/comparable/equal_mcd.hpp>
-#include <boost/hana/maybe/maybe.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Comparable` for `Maybe`s.
-    //!
-    //! Two `Maybe`s are equal if and only if they are both empty or they
-    //! both contain a value and those values are equal.
-    //!
-    //! ### Example
-    //! @snippet example/maybe/comparable.cpp main
-    template <>
-    struct Comparable::instance<Maybe, Maybe> : Comparable::equal_mcd {
-        template <typename T, typename U>
-        static constexpr decltype(auto)
-        equal_impl(maybe_detail::just<T> const& t, maybe_detail::just<U> const& u)
-        { return equal(t.val, u.val); }
-
-        template <bool tv, typename T, bool uv, typename U>
-        static constexpr auto
-        equal_impl(maybe_detail::maybe<tv, T> const&,
-                   maybe_detail::maybe<uv, U> const&)
-        { return bool_<tv == uv>; }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_MAYBE_COMPARABLE_HPP
diff --git a/include/boost/hana/maybe/foldable.hpp b/include/boost/hana/maybe/foldable.hpp
deleted file mode 100644
index 340a5833f..000000000
--- a/include/boost/hana/maybe/foldable.hpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Foldable` for `boost::hana::Maybe`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_MAYBE_FOLDABLE_HPP
-#define BOOST_HANA_MAYBE_FOLDABLE_HPP
-
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/foldable/folds_mcd.hpp>
-#include <boost/hana/maybe/maybe.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Foldable` for `Maybe`s.
-    //!
-    //! Folding a `Maybe` is equivalent to folding a `List` containing either
-    //! no elements (for `nothing`) or `x` (for `just(x)`). The `Foldable`
-    //! instance follows from that.
-    //!
-    //! ### Example
-    //! @snippet example/maybe/foldable.cpp main
-    template <>
-    struct Foldable::instance<Maybe>
-        : Foldable::folds_mcd
-    {
-        template <typename M, typename S, typename F>
-        static constexpr decltype(auto) foldr_impl(M&& m, S&& s, F&& f) {
-            // While it _seems_ like we're forwarding `s` twice, `s` may be
-            // moved from in only the branch which is actually executed.
-            return maybe(
-                detail::std::forward<S>(s),
-                [&f, &s](auto&& x) -> decltype(auto) {
-                    return detail::std::forward<F>(f)(
-                        detail::std::forward<decltype(x)>(x),
-                        detail::std::forward<S>(s)
-                    );
-                },
-                detail::std::forward<M>(m)
-            );
-        }
-
-        template <typename M, typename S, typename F>
-        static constexpr decltype(auto) foldl_impl(M&& m, S&& s, F&& f) {
-            // The same comment as above applies for the forwarding of `s`.
-            return maybe(
-                detail::std::forward<S>(s),
-                [&f, &s](auto&& x) -> decltype(auto) {
-                    return detail::std::forward<F>(f)(
-                        detail::std::forward<S>(s),
-                        detail::std::forward<decltype(x)>(x)
-                    );
-                },
-                detail::std::forward<M>(m)
-            );
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_MAYBE_FOLDABLE_HPP
diff --git a/include/boost/hana/maybe/functor.hpp b/include/boost/hana/maybe/functor.hpp
deleted file mode 100644
index 13eb4ca6e..000000000
--- a/include/boost/hana/maybe/functor.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Functor` for `boost::hana::Maybe`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_MAYBE_FUNCTOR_HPP
-#define BOOST_HANA_MAYBE_FUNCTOR_HPP
-
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/functional/compose.hpp>
-#include <boost/hana/functor/fmap_mcd.hpp>
-#include <boost/hana/maybe/maybe.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Functor` for `Maybe`s.
-    //!
-    //! A `Maybe` can be seen as a `List` containing either one element
-    //! (`just(x)`) or no elements at all (`nothing`). As such, `fmap` for
-    //! `Maybe`s returns `nothing` when applied to `nothing` and `just(f(x))`
-    //! when applied to `just(x)`.
-    //!
-    //! ### Example
-    //! @snippet example/maybe/functor.cpp main
-    template <>
-    struct Functor::instance<Maybe> : Functor::fmap_mcd {
-        template <typename M, typename F>
-        static constexpr decltype(auto) fmap_impl(M&& m, F&& f) {
-            return maybe(
-                nothing,
-                compose(just, detail::std::forward<F>(f)),
-                detail::std::forward<M>(m)
-            );
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_MAYBE_FUNCTOR_HPP
diff --git a/include/boost/hana/maybe/monad.hpp b/include/boost/hana/maybe/monad.hpp
deleted file mode 100644
index 293fd0b93..000000000
--- a/include/boost/hana/maybe/monad.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Monad` for `boost::hana::Maybe`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_MAYBE_MONAD_HPP
-#define BOOST_HANA_MAYBE_MONAD_HPP
-
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/functional/id.hpp>
-#include <boost/hana/maybe/maybe.hpp>
-#include <boost/hana/monad/flatten_mcd.hpp>
-
-// Mcd
-#include <boost/hana/maybe/applicative.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Monad` for `Maybe`s.
-    //!
-    //! The `Maybe` `Monad` makes it easy to compose actions that might fail.
-    //! One can feed an optional value if there is one into a function with
-    //! `bind`, which will return `nothing` if there is no value. Finally,
-    //! optional-optional values can have their redundant level of
-    //! `Maybe`ness removed with `flatten`.
-    //!
-    //! ### Example
-    //! @include example/maybe/monad.cpp
-    template <>
-    struct Monad::instance<Maybe> : Monad::flatten_mcd<Maybe> {
-        template <typename MMX>
-        static constexpr decltype(auto) flatten_impl(MMX&& mmx) {
-            return maybe(nothing, id, detail::std::forward<MMX>(mmx));
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_MAYBE_MONAD_HPP
diff --git a/include/boost/hana/maybe/searchable.hpp b/include/boost/hana/maybe/searchable.hpp
deleted file mode 100644
index 6076cacfc..000000000
--- a/include/boost/hana/maybe/searchable.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Searchable` for `boost::hana::Maybe`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_MAYBE_SEARCHABLE_HPP
-#define BOOST_HANA_MAYBE_SEARCHABLE_HPP
-
-#include <boost/hana/bool.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/logical/logical.hpp>
-#include <boost/hana/maybe/maybe.hpp>
-#include <boost/hana/searchable/mcd.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Searchable` for `Maybe`s.
-    //!
-    //! Searching a `Maybe` is equivalent to searching a list containing
-    //! `x` for `just(x)` and an empty list for `nothing`.
-    //!
-    //! ### Example
-    //! @snippet example/maybe/searchable.cpp main
-    template <>
-    struct Searchable::instance<Maybe> : Searchable::mcd {
-        template <typename M, typename Pred>
-        static constexpr decltype(auto) find_impl(M&& m, Pred&& p) {
-            return maybe(nothing,
-                [&p](auto&& x) -> decltype(auto) {
-                    return eval_if(detail::std::forward<Pred>(p)(x),
-                        [&x](auto _) -> decltype(auto) {
-                            return just(detail::std::forward<decltype(x)>(x));
-                        },
-                        [](auto) { return nothing; }
-                    );
-                },
-                detail::std::forward<M>(m)
-            );
-        }
-
-        template <typename M, typename Pred>
-        static constexpr decltype(auto) any_impl(M&& m, Pred&& p) {
-            return maybe(false_,
-                detail::std::forward<Pred>(p),
-                detail::std::forward<M>(m)
-            );
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_MAYBE_SEARCHABLE_HPP
diff --git a/include/boost/hana/maybe/traversable.hpp b/include/boost/hana/maybe/traversable.hpp
deleted file mode 100644
index 4fbfc530b..000000000
--- a/include/boost/hana/maybe/traversable.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Traversable` for `boost::hana::Maybe`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_MAYBE_TRAVERSABLE_HPP
-#define BOOST_HANA_MAYBE_TRAVERSABLE_HPP
-
-#include <boost/hana/applicative/applicative.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/functor/functor.hpp>
-#include <boost/hana/maybe/maybe.hpp>
-#include <boost/hana/traversable/traverse_mcd.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Traversable` for `Maybe`s.
-    //!
-    //! Traversing `nothing` yields `nothing` in the new applicative, and
-    //! traversing `just(x)` applies the function and maps `just` inside
-    //! the resulting applicative.
-    //!
-    //! ### Example
-    //! @snippet example/maybe/traversable.cpp main
-    template <>
-    struct Traversable::instance<Maybe> : Traversable::traverse_mcd {
-        template <typename A, typename Mx, typename F>
-        static constexpr decltype(auto) traverse_impl(Mx&& mx, F&& f) {
-            return maybe(
-                lift<A>(nothing),
-                [&f](auto&& x) -> decltype(auto) {
-                    return fmap(
-                        detail::std::forward<F>(f)(
-                            detail::std::forward<decltype(x)>(x)
-                        ),
-                        just
-                    );
-                },
-                detail::std::forward<Mx>(mx)
-            );
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_MAYBE_TRAVERSABLE_HPP
diff --git a/include/boost/hana/monad.hpp b/include/boost/hana/monad.hpp
index aa2ff4402..e1d547f6c 100644
--- a/include/boost/hana/monad.hpp
+++ b/include/boost/hana/monad.hpp
@@ -10,10 +10,79 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_MONAD_HPP
 #define BOOST_HANA_MONAD_HPP
 
-#include <boost/hana/monad/bind_mcd.hpp>
-#include <boost/hana/monad/flatten_mcd.hpp>
-#include <boost/hana/monad/list_mcd.hpp>
-#include <boost/hana/monad/monad.hpp>
-#include <boost/hana/monad/operators.hpp>
+#include <boost/hana/fwd/monad.hpp>
+
+#include <boost/hana/applicative.hpp>
+#include <boost/hana/core/datatype.hpp>
+#include <boost/hana/core/operators.hpp>
+#include <boost/hana/detail/std/enable_if.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+#include <boost/hana/functional/always.hpp>
+#include <boost/hana/functional/id.hpp>
+#include <boost/hana/functor.hpp>
+
+
+namespace boost { namespace hana {
+    namespace operators {
+        //! Equivalent to `bind`.
+        //! @relates boost::hana::Monad
+        //!
+        //! @note
+        //! This was preferred over `>>=` because `>>=` is right associative
+        //! in C++, which makes it impossible to chain computations.
+        template <typename M, typename F, typename = typename detail::std::enable_if<
+            enable_operators<Monad, datatype_t<M>>::value
+        >::type>
+        constexpr decltype(auto) operator|(M&& m, F&& f) {
+            return bind(
+                detail::std::forward<decltype(m)>(m),
+                detail::std::forward<decltype(f)>(f)
+            );
+        }
+    }
+
+    namespace monad_detail {
+        template <typename M>
+        struct common {
+            template <typename M1, typename M2>
+            static constexpr decltype(auto) then_impl(M1&& m1, M2&& m2) {
+                return bind(
+                    detail::std::forward<M1>(m1),
+                    always(detail::std::forward<M2>(m2))
+                );
+            }
+
+            template <typename F>
+            static constexpr auto tap_impl(F&& f) {
+                return [f(detail::std::forward<F>(f))](auto&& x) -> decltype(auto) {
+                    f(x);
+                    return lift<M>(detail::std::forward<decltype(x)>(x));
+                };
+            }
+        };
+    }
+
+    //! Minimal complete definition: `bind`
+    template <typename M>
+    struct Monad::bind_mcd : monad_detail::common<M> {
+        template <typename MM>
+        static constexpr decltype(auto) flatten_impl(MM&& monad)
+        { return bind(detail::std::forward<MM>(monad), id); }
+    };
+
+    //! Minimal complete definition: `flatten`
+    template <typename M>
+    struct Monad::flatten_mcd : monad_detail::common<M> {
+        template <typename Mon, typename F>
+        static constexpr decltype(auto) bind_impl(Mon&& monad, F&& f) {
+            return flatten(
+                fmap(
+                    detail::std::forward<Mon>(monad),
+                    detail::std::forward<F>(f)
+                )
+            );
+        }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_MONAD_HPP
diff --git a/include/boost/hana/monad/bind_mcd.hpp b/include/boost/hana/monad/bind_mcd.hpp
deleted file mode 100644
index 08335ea6f..000000000
--- a/include/boost/hana/monad/bind_mcd.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Monad::bind_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_MONAD_BIND_MCD_HPP
-#define BOOST_HANA_MONAD_BIND_MCD_HPP
-
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/functional/id.hpp>
-#include <boost/hana/monad/detail/common.hpp>
-#include <boost/hana/monad/monad.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition: `bind`
-    template <typename M>
-    struct Monad::bind_mcd : monad_detail::common<M> {
-        template <typename MM>
-        static constexpr decltype(auto) flatten_impl(MM&& monad)
-        { return bind(detail::std::forward<MM>(monad), id); }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_MONAD_BIND_MCD_HPP
diff --git a/include/boost/hana/monad/detail/common.hpp b/include/boost/hana/monad/detail/common.hpp
deleted file mode 100644
index bdea17183..000000000
--- a/include/boost/hana/monad/detail/common.hpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*!
-@file
-Defines a common part of the mcd for `Monad`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_MONAD_DETAIL_COMMON_HPP
-#define BOOST_HANA_MONAD_DETAIL_COMMON_HPP
-
-#include <boost/hana/applicative/applicative.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/functional/always.hpp>
-#include <boost/hana/monad/monad.hpp>
-
-
-namespace boost { namespace hana { namespace monad_detail {
-    template <typename M>
-    struct common {
-        template <typename M1, typename M2>
-        static constexpr decltype(auto) then_impl(M1&& m1, M2&& m2) {
-            return bind(
-                detail::std::forward<M1>(m1),
-                always(detail::std::forward<M2>(m2))
-            );
-        }
-
-        template <typename F>
-        static constexpr auto tap_impl(F&& f) {
-            return [f(detail::std::forward<F>(f))](auto&& x) -> decltype(auto) {
-                f(x);
-                return lift<M>(detail::std::forward<decltype(x)>(x));
-            };
-        }
-    };
-}}} // end namespace boost::hana::monad_detail
-
-#endif // !BOOST_HANA_MONAD_DETAIL_COMMON_HPP
diff --git a/include/boost/hana/monad/flatten_mcd.hpp b/include/boost/hana/monad/flatten_mcd.hpp
deleted file mode 100644
index b35fcf792..000000000
--- a/include/boost/hana/monad/flatten_mcd.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Monad::flatten_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_MONAD_FLATTEN_MCD_HPP
-#define BOOST_HANA_MONAD_FLATTEN_MCD_HPP
-
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/functor/functor.hpp>
-#include <boost/hana/monad/detail/common.hpp>
-#include <boost/hana/monad/monad.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition: `flatten`
-    template <typename M>
-    struct Monad::flatten_mcd : monad_detail::common<M> {
-        template <typename Mon, typename F>
-        static constexpr decltype(auto) bind_impl(Mon&& monad, F&& f) {
-            return flatten(
-                fmap(
-                    detail::std::forward<Mon>(monad),
-                    detail::std::forward<F>(f)
-                )
-            );
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_MONAD_FLATTEN_MCD_HPP
diff --git a/include/boost/hana/monad/list_mcd.hpp b/include/boost/hana/monad/list_mcd.hpp
deleted file mode 100644
index 6c0b52f43..000000000
--- a/include/boost/hana/monad/list_mcd.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Monad::list_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_MONAD_LIST_MCD_HPP
-#define BOOST_HANA_MONAD_LIST_MCD_HPP
-
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/foldable/foldable.hpp>
-#include <boost/hana/list/list.hpp>
-#include <boost/hana/monad/flatten_mcd.hpp>
-
-
-namespace boost { namespace hana {
-    template <typename T>
-    struct Monad::list_mcd : Monad::flatten_mcd<T> {
-        template <typename Xss>
-        static constexpr decltype(auto) flatten_impl(Xss&& xss) {
-            return foldl(detail::std::forward<Xss>(xss), nil<T>, concat);
-        }
-    };
-
-    //! `Monad` instance for instances of the `List` type class.
-    //!
-    //! A function returning a list of results can be mapped over all the
-    //! elements of a list and have all the results concatenated using `bind`.
-    //! Also, a list of lists can be flattened one level with `flatten`.
-    //!
-    //! ### Example
-    //! @snippet example/list/monad.cpp main
-    template <typename T>
-    struct Monad::instance<T, when<is_a<List, T>()>>
-        : Monad::list_mcd<T>
-    { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_MONAD_LIST_MCD_HPP
diff --git a/include/boost/hana/monad/operators.hpp b/include/boost/hana/monad/operators.hpp
deleted file mode 100644
index 55ea041ff..000000000
--- a/include/boost/hana/monad/operators.hpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*!
-@file
-Defines custom operators for `boost::hana::Monad`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_MONAD_OPERATORS_HPP
-#define BOOST_HANA_MONAD_OPERATORS_HPP
-
-#include <boost/hana/monad/monad.hpp>
-
-#include <boost/hana/core/datatype.hpp>
-#include <boost/hana/core/operators.hpp>
-#include <boost/hana/detail/std/enable_if.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-
-
-namespace boost { namespace hana { namespace operators {
-    //! Equivalent to `bind`.
-    //! @relates boost::hana::Monad
-    //!
-    //! @note
-    //! This was preferred over `>>=` because `>>=` is right associative
-    //! in C++, which makes it impossible to chain computations.
-    template <typename M, typename F, typename = detail::std::enable_if_t<
-        enable_operators<Monad, datatype_t<M>>::value
-    >>
-    constexpr decltype(auto) operator|(M&& m, F&& f) {
-        return bind(
-            detail::std::forward<decltype(m)>(m),
-            detail::std::forward<decltype(f)>(f)
-        );
-    }
-}}} // end namespace boost::hana::operators
-
-#endif // !BOOST_HANA_MONAD_OPERATORS_HPP
diff --git a/include/boost/hana/monoid.hpp b/include/boost/hana/monoid.hpp
index f5d3c7a53..feb3d8ac3 100644
--- a/include/boost/hana/monoid.hpp
+++ b/include/boost/hana/monoid.hpp
@@ -10,9 +10,32 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_MONOID_HPP
 #define BOOST_HANA_MONOID_HPP
 
-#include <boost/hana/monoid/integral_constant_mcd.hpp>
-#include <boost/hana/monoid/mcd.hpp>
-#include <boost/hana/monoid/monoid.hpp>
-#include <boost/hana/monoid/operators.hpp>
+#include <boost/hana/fwd/monoid.hpp>
+
+#include <boost/hana/core/datatype.hpp>
+#include <boost/hana/core/operators.hpp>
+#include <boost/hana/detail/std/enable_if.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+
+
+namespace boost { namespace hana {
+    //! Minimal complete definition : `zero` and `plus`
+    struct Monoid::mcd { };
+
+    namespace operators {
+        //! Equivalent to `plus`.
+        //! @relates boost::hana::Monoid
+        template <typename X, typename Y, typename = typename detail::std::enable_if<
+            enable_operators<Monoid, datatype_t<X>>::value ||
+            enable_operators<Monoid, datatype_t<Y>>::value
+        >::type>
+        constexpr decltype(auto) operator+(X&& x, Y&& y) {
+            return plus(
+                detail::std::forward<decltype(x)>(x),
+                detail::std::forward<decltype(y)>(y)
+            );
+        }
+    }
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_MONOID_HPP
diff --git a/include/boost/hana/monoid/integral_constant_mcd.hpp b/include/boost/hana/monoid/integral_constant_mcd.hpp
deleted file mode 100644
index 4c60017d7..000000000
--- a/include/boost/hana/monoid/integral_constant_mcd.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Monoid::integral_constant_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_MONOID_INTEGRAL_CONSTANT_MCD_HPP
-#define BOOST_HANA_MONOID_INTEGRAL_CONSTANT_MCD_HPP
-
-#include <boost/hana/constant/constant.hpp>
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/detail/constexpr.hpp>
-#include <boost/hana/detail/std/is_integral.hpp>
-#include <boost/hana/integral_constant/integral_constant.hpp>
-#include <boost/hana/monoid/mcd.hpp>
-
-
-namespace boost { namespace hana {
-    //! Any two `IntegralConstant`s form an additive `Monoid`.
-    template <typename I1, typename I2>
-    struct Monoid::integral_constant_mcd : Monoid::mcd {
-        template <typename X, typename Y>
-        static constexpr auto plus_impl(X x, Y y) {
-            constexpr auto sum = value(x) + value(y);
-            return integral_constant<I1, decltype(sum), sum>;
-        }
-
-        static BOOST_HANA_CONSTEXPR_LAMBDA auto zero_impl()
-        { return integral_constant<I1, int, 0>; }
-    };
-
-    template <typename I, typename T>
-    struct Monoid::instance<I, T, when<
-        is_an<IntegralConstant, I>() &&
-        detail::std::is_integral<T>{}
-    >>
-        : Monoid::mcd
-    {
-        template <typename X, typename Y>
-        static constexpr auto plus_impl(X x, Y y)
-        { return value(x) + y; }
-    };
-
-    template <typename T, typename I>
-    struct Monoid::instance<T, I, when<
-        detail::std::is_integral<T>{} &&
-        is_an<IntegralConstant, I>()
-    >>
-        : Monoid::mcd
-    {
-        template <typename X, typename Y>
-        static constexpr auto plus_impl(X x, Y y)
-        { return x + value(y); }
-    };
-
-    template <typename I1, typename I2>
-    struct Monoid::instance<I1, I2, when<
-        is_an<IntegralConstant, I1>() &&
-        is_an<IntegralConstant, I2>()
-    >>
-        : Monoid::integral_constant_mcd<I1, I2>
-    { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_MONOID_INTEGRAL_CONSTANT_MCD_HPP
diff --git a/include/boost/hana/monoid/mcd.hpp b/include/boost/hana/monoid/mcd.hpp
deleted file mode 100644
index 734656314..000000000
--- a/include/boost/hana/monoid/mcd.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Monoid::mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_MONOID_MCD_HPP
-#define BOOST_HANA_MONOID_MCD_HPP
-
-#include <boost/hana/monoid/monoid.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition : `zero` and `plus`
-    struct Monoid::mcd { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_MONOID_MCD_HPP
diff --git a/include/boost/hana/monoid/operators.hpp b/include/boost/hana/monoid/operators.hpp
deleted file mode 100644
index f9c0b90a6..000000000
--- a/include/boost/hana/monoid/operators.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*!
-@file
-Defines custom operators for `boost::hana::Monoid`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_MONOID_OPERATORS_HPP
-#define BOOST_HANA_MONOID_OPERATORS_HPP
-
-#include <boost/hana/monoid/monoid.hpp>
-
-#include <boost/hana/core/datatype.hpp>
-#include <boost/hana/core/operators.hpp>
-#include <boost/hana/detail/std/enable_if.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-
-
-namespace boost { namespace hana { namespace operators {
-    //! Equivalent to `plus`.
-    //! @relates boost::hana::Monoid
-    template <typename X, typename Y, typename = detail::std::enable_if_t<
-        enable_operators<Monoid, datatype_t<X>>::value ||
-        enable_operators<Monoid, datatype_t<Y>>::value
-    >>
-    constexpr decltype(auto) operator+(X&& x, Y&& y) {
-        return plus(
-            detail::std::forward<decltype(x)>(x),
-            detail::std::forward<decltype(y)>(y)
-        );
-    }
-}}} // end namespace boost::hana::operators
-
-#endif // !BOOST_HANA_MONOID_OPERATORS_HPP
diff --git a/include/boost/hana/orderable.hpp b/include/boost/hana/orderable.hpp
index 6fd8ada77..f8dfd198b 100644
--- a/include/boost/hana/orderable.hpp
+++ b/include/boost/hana/orderable.hpp
@@ -10,9 +10,114 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_ORDERABLE_HPP
 #define BOOST_HANA_ORDERABLE_HPP
 
-#include <boost/hana/orderable/integral_constant_mcd.hpp>
-#include <boost/hana/orderable/less_mcd.hpp>
-#include <boost/hana/orderable/operators.hpp>
-#include <boost/hana/orderable/orderable.hpp>
+#include <boost/hana/fwd/orderable.hpp>
+
+#include <boost/hana/core/datatype.hpp>
+#include <boost/hana/core/operators.hpp>
+#include <boost/hana/detail/std/enable_if.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+#include <boost/hana/logical.hpp>
+
+
+namespace boost { namespace hana {
+    namespace operators {
+        //! Equivalent to `less`.
+        //! @relates boost::hana::Orderable
+        template <typename X, typename Y, typename = detail::std::enable_if_t<
+            enable_operators<Orderable, datatype_t<X>>::value ||
+            enable_operators<Orderable, datatype_t<Y>>::value
+        >>
+        constexpr decltype(auto) operator<(X&& x, Y&& y) {
+            return less(
+                detail::std::forward<decltype(x)>(x),
+                detail::std::forward<decltype(y)>(y)
+            );
+        }
+
+        //! Equivalent to `less_equal`.
+        //! @relates boost::hana::Orderable
+        template <typename X, typename Y, typename = detail::std::enable_if_t<
+            enable_operators<Orderable, datatype_t<X>>::value ||
+            enable_operators<Orderable, datatype_t<Y>>::value
+        >>
+        constexpr decltype(auto) operator<=(X&& x, Y&& y) {
+            return less_equal(
+                detail::std::forward<decltype(x)>(x),
+                detail::std::forward<decltype(y)>(y)
+            );
+        }
+
+        //! Equivalent to `greater`.
+        //! @relates boost::hana::Orderable
+        template <typename X, typename Y, typename = detail::std::enable_if_t<
+            enable_operators<Orderable, datatype_t<X>>::value ||
+            enable_operators<Orderable, datatype_t<Y>>::value
+        >>
+        constexpr decltype(auto) operator>(X&& x, Y&& y) {
+            return greater(
+                detail::std::forward<decltype(x)>(x),
+                detail::std::forward<decltype(y)>(y)
+            );
+        }
+
+        //! Equivalent to `greater_equal`.
+        //! @relates boost::hana::Orderable
+        template <typename X, typename Y, typename = detail::std::enable_if_t<
+            enable_operators<Orderable, datatype_t<X>>::value ||
+            enable_operators<Orderable, datatype_t<Y>>::value
+        >>
+        constexpr decltype(auto) operator>=(X&& x, Y&& y) {
+            return greater_equal(
+                detail::std::forward<decltype(x)>(x),
+                detail::std::forward<decltype(y)>(y)
+            );
+        }
+    }
+
+    //! Minimal complete definition: `less`
+    struct Orderable::less_mcd {
+        template <typename X, typename Y>
+        static constexpr decltype(auto) less_equal_impl(X&& x, Y&& y) {
+            return not_(less(
+                detail::std::forward<Y>(y),
+                detail::std::forward<X>(x)
+            ));
+        }
+
+        template <typename X, typename Y>
+        static constexpr decltype(auto) greater_impl(X&& x, Y&& y) {
+            return less(
+                detail::std::forward<Y>(y),
+                detail::std::forward<X>(x)
+            );
+        }
+
+        template <typename X, typename Y>
+        static constexpr decltype(auto) greater_equal_impl(X x, Y y) {
+            return not_(less(
+                detail::std::forward<X>(x),
+                detail::std::forward<Y>(y)
+            ));
+        }
+
+        template <typename X, typename Y>
+        static constexpr decltype(auto) min_impl(X&& x, Y&& y) {
+            decltype(auto) cond = less(x, y);
+            return if_(detail::std::forward<decltype(cond)>(cond),
+                detail::std::forward<X>(x),
+                detail::std::forward<Y>(y)
+            );
+        }
+
+        template <typename X, typename Y>
+        static constexpr decltype(auto) max_impl(X&& x, Y&& y) {
+            decltype(auto) cond = less(x, y);
+            return if_(detail::std::forward<decltype(cond)>(cond),
+                detail::std::forward<Y>(y),
+                detail::std::forward<X>(x)
+            );
+        }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_ORDERABLE_HPP
diff --git a/include/boost/hana/orderable/integral_constant_mcd.hpp b/include/boost/hana/orderable/integral_constant_mcd.hpp
deleted file mode 100644
index 0c188d583..000000000
--- a/include/boost/hana/orderable/integral_constant_mcd.hpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Orderable::integral_constant_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_ORDERABLE_INTEGRAL_CONSTANT_MCD_HPP
-#define BOOST_HANA_ORDERABLE_INTEGRAL_CONSTANT_MCD_HPP
-
-#include <boost/hana/constant/constant.hpp>
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/detail/std/is_integral.hpp>
-#include <boost/hana/integral_constant/integral_constant.hpp>
-#include <boost/hana/logical/integral_constant_mcd.hpp>
-#include <boost/hana/orderable/less_mcd.hpp>
-
-
-namespace boost { namespace hana {
-    template <typename I1, typename I2>
-    struct Orderable::integral_constant_mcd : Orderable::less_mcd {
-        template <typename X, typename Y>
-        static constexpr auto less_impl(X x, Y y) {
-            constexpr auto ord = value(x) < value(y);
-            return integral_constant<I1, decltype(ord), ord>;
-        }
-    };
-
-    template <typename I, typename T>
-    struct Orderable::instance<I, T, when<
-        is_an<IntegralConstant, I>() &&
-        detail::std::is_integral<T>{}
-    >>
-        : Orderable::less_mcd
-    {
-        template <typename X, typename Y>
-        static constexpr auto less_impl(X x, Y y)
-        { return value(x) < y; }
-    };
-
-    template <typename T, typename I>
-    struct Orderable::instance<T, I, when<
-        detail::std::is_integral<T>{} &&
-        is_an<IntegralConstant, I>()
-    >>
-        : Orderable::less_mcd
-    {
-        template <typename X, typename Y>
-        static constexpr auto less_impl(X x, Y y)
-        { return x < value(y); }
-    };
-
-    template <typename I1, typename I2>
-    struct Orderable::instance<I1, I2, when<
-        is_an<IntegralConstant, I1>() &&
-        is_an<IntegralConstant, I2>()
-    >>
-        : Orderable::integral_constant_mcd<I1, I2>
-    { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_ORDERABLE_INTEGRAL_CONSTANT_MCD_HPP
diff --git a/include/boost/hana/orderable/less_mcd.hpp b/include/boost/hana/orderable/less_mcd.hpp
deleted file mode 100644
index d078c3170..000000000
--- a/include/boost/hana/orderable/less_mcd.hpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Orderable::less_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_ORDERABLE_LESS_MCD_HPP
-#define BOOST_HANA_ORDERABLE_LESS_MCD_HPP
-
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/logical/logical.hpp>
-#include <boost/hana/orderable/orderable.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition: `less`
-    struct Orderable::less_mcd {
-        template <typename X, typename Y>
-        static constexpr decltype(auto) less_equal_impl(X&& x, Y&& y) {
-            return not_(less(
-                detail::std::forward<Y>(y),
-                detail::std::forward<X>(x)
-            ));
-        }
-
-        template <typename X, typename Y>
-        static constexpr decltype(auto) greater_impl(X&& x, Y&& y) {
-            return less(
-                detail::std::forward<Y>(y),
-                detail::std::forward<X>(x)
-            );
-        }
-
-        template <typename X, typename Y>
-        static constexpr decltype(auto) greater_equal_impl(X x, Y y) {
-            return not_(less(
-                detail::std::forward<X>(x),
-                detail::std::forward<Y>(y)
-            ));
-        }
-
-        template <typename X, typename Y>
-        static constexpr decltype(auto) min_impl(X&& x, Y&& y) {
-            decltype(auto) cond = less(x, y);
-            return if_(detail::std::forward<decltype(cond)>(cond),
-                detail::std::forward<X>(x),
-                detail::std::forward<Y>(y)
-            );
-        }
-
-        template <typename X, typename Y>
-        static constexpr decltype(auto) max_impl(X&& x, Y&& y) {
-            decltype(auto) cond = less(x, y);
-            return if_(detail::std::forward<decltype(cond)>(cond),
-                detail::std::forward<Y>(y),
-                detail::std::forward<X>(x)
-            );
-        }
-    };
-}}
-
-#endif // !BOOST_HANA_ORDERABLE_LESS_MCD_HPP
diff --git a/include/boost/hana/orderable/operators.hpp b/include/boost/hana/orderable/operators.hpp
deleted file mode 100644
index b25f509b5..000000000
--- a/include/boost/hana/orderable/operators.hpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/*!
-@file
-Defines custom operators for `boost::hana::Orderable`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_ORDERABLE_OPERATORS_HPP
-#define BOOST_HANA_ORDERABLE_OPERATORS_HPP
-
-#include <boost/hana/orderable/orderable.hpp>
-
-#include <boost/hana/core/datatype.hpp>
-#include <boost/hana/core/operators.hpp>
-#include <boost/hana/detail/std/enable_if.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-
-
-namespace boost { namespace hana { namespace operators {
-    //! Equivalent to `less`.
-    //! @relates boost::hana::Orderable
-    template <typename X, typename Y, typename = detail::std::enable_if_t<
-        enable_operators<Orderable, datatype_t<X>>::value ||
-        enable_operators<Orderable, datatype_t<Y>>::value
-    >>
-    constexpr decltype(auto) operator<(X&& x, Y&& y) {
-        return less(
-            detail::std::forward<decltype(x)>(x),
-            detail::std::forward<decltype(y)>(y)
-        );
-    }
-
-    //! Equivalent to `less_equal`.
-    //! @relates boost::hana::Orderable
-    template <typename X, typename Y, typename = detail::std::enable_if_t<
-        enable_operators<Orderable, datatype_t<X>>::value ||
-        enable_operators<Orderable, datatype_t<Y>>::value
-    >>
-    constexpr decltype(auto) operator<=(X&& x, Y&& y) {
-        return less_equal(
-            detail::std::forward<decltype(x)>(x),
-            detail::std::forward<decltype(y)>(y)
-        );
-    }
-
-    //! Equivalent to `greater`.
-    //! @relates boost::hana::Orderable
-    template <typename X, typename Y, typename = detail::std::enable_if_t<
-        enable_operators<Orderable, datatype_t<X>>::value ||
-        enable_operators<Orderable, datatype_t<Y>>::value
-    >>
-    constexpr decltype(auto) operator>(X&& x, Y&& y) {
-        return greater(
-            detail::std::forward<decltype(x)>(x),
-            detail::std::forward<decltype(y)>(y)
-        );
-    }
-
-    //! Equivalent to `greater_equal`.
-    //! @relates boost::hana::Orderable
-    template <typename X, typename Y, typename = detail::std::enable_if_t<
-        enable_operators<Orderable, datatype_t<X>>::value ||
-        enable_operators<Orderable, datatype_t<Y>>::value
-    >>
-    constexpr decltype(auto) operator>=(X&& x, Y&& y) {
-        return greater_equal(
-            detail::std::forward<decltype(x)>(x),
-            detail::std::forward<decltype(y)>(y)
-        );
-    }
-}}} // end namespace boost::hana::operators
-
-#endif // !BOOST_HANA_ORDERABLE_OPERATORS_HPP
diff --git a/include/boost/hana/pair.hpp b/include/boost/hana/pair.hpp
index 353654265..2280ee76b 100644
--- a/include/boost/hana/pair.hpp
+++ b/include/boost/hana/pair.hpp
@@ -10,11 +10,37 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_PAIR_HPP
 #define BOOST_HANA_PAIR_HPP
 
-#include <boost/hana/pair/pair.hpp>
+#include <boost/hana/fwd/pair.hpp>
 
-// Instances
-#include <boost/hana/pair/comparable.hpp>
-#include <boost/hana/pair/foldable.hpp>
-#include <boost/hana/pair/product.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+
+// instances
+#include <boost/hana/product.hpp>
+
+
+namespace boost { namespace hana {
+    //! Instance of `Product` for `Pair`s.
+    //!
+    //! ### Example
+    //! @snippet example/pair.cpp product
+    //!
+    //! @todo
+    //! Use perfect forwarding in `first_impl` and `second_impl` once
+    //! bug http://llvm.org/bugs/show_bug.cgi?id=20619 is fixed.
+    template <>
+    struct Product::instance<Pair> : Product::mcd {
+        template <typename F, typename S>
+        static constexpr decltype(auto) make_impl(F&& f, S&& s)
+        { return pair(detail::std::forward<F>(f), detail::std::forward<S>(s)); }
+
+        template <typename P>
+        static constexpr auto first_impl(P p)
+        { return p.first; }
+
+        template <typename P>
+        static constexpr auto second_impl(P p)
+        { return p.second; }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_PAIR_HPP
diff --git a/include/boost/hana/pair/comparable.hpp b/include/boost/hana/pair/comparable.hpp
deleted file mode 100644
index de756cec7..000000000
--- a/include/boost/hana/pair/comparable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Comparable` for `boost::hana::Pair`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_PAIR_COMPARABLE_HPP
-#define BOOST_HANA_PAIR_COMPARABLE_HPP
-
-#include <boost/hana/pair/product.hpp>
-#include <boost/hana/comparable/product_mcd.hpp>
-
-#endif // !BOOST_HANA_PAIR_COMPARABLE_HPP
diff --git a/include/boost/hana/pair/foldable.hpp b/include/boost/hana/pair/foldable.hpp
deleted file mode 100644
index 36d146acf..000000000
--- a/include/boost/hana/pair/foldable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Foldable` for `boost::hana::Pair`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_PAIR_FOLDABLE_HPP
-#define BOOST_HANA_PAIR_FOLDABLE_HPP
-
-#include <boost/hana/pair/product.hpp>
-#include <boost/hana/foldable/product_mcd.hpp>
-
-#endif // !BOOST_HANA_PAIR_FOLDABLE_HPP
diff --git a/include/boost/hana/pair/product.hpp b/include/boost/hana/pair/product.hpp
deleted file mode 100644
index 28fbc6882..000000000
--- a/include/boost/hana/pair/product.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Product` for `boost::hana::Pair`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_PAIR_PRODUCT_HPP
-#define BOOST_HANA_PAIR_PRODUCT_HPP
-
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/pair/pair.hpp>
-#include <boost/hana/product/mcd.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Product` for `Pair`s.
-    //!
-    //! ### Example
-    //! @snippet example/pair.cpp product
-    //!
-    //! @todo
-    //! Use perfect forwarding in `first_impl` and `second_impl` once
-    //! bug http://llvm.org/bugs/show_bug.cgi?id=20619 is fixed.
-    template <>
-    struct Product::instance<Pair> : Product::mcd {
-        template <typename F, typename S>
-        static constexpr decltype(auto) make_impl(F&& f, S&& s)
-        { return pair(detail::std::forward<F>(f), detail::std::forward<S>(s)); }
-
-        template <typename P>
-        static constexpr auto first_impl(P p)
-        { return p.first; }
-
-        template <typename P>
-        static constexpr auto second_impl(P p)
-        { return p.second; }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_PAIR_PRODUCT_HPP
diff --git a/include/boost/hana/product.hpp b/include/boost/hana/product.hpp
index f3896df11..e08700794 100644
--- a/include/boost/hana/product.hpp
+++ b/include/boost/hana/product.hpp
@@ -10,7 +10,66 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_PRODUCT_HPP
 #define BOOST_HANA_PRODUCT_HPP
 
-#include <boost/hana/product/mcd.hpp>
-#include <boost/hana/product/product.hpp>
+#include <boost/hana/fwd/product.hpp>
+
+#include <boost/hana/core/is_a.hpp>
+#include <boost/hana/core/when.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+#include <boost/hana/logical.hpp>
+
+// provided instances
+#include <boost/hana/comparable.hpp>
+#include <boost/hana/foldable.hpp>
+
+
+namespace boost { namespace hana {
+    //! Minimal complete definition: `first`, `second` and `make`.
+    struct Product::mcd { };
+
+    //! Mininal complete definition: `Product`
+    struct Comparable::product_mcd : Comparable::equal_mcd {
+        template <typename X, typename Y>
+        static constexpr decltype(auto) equal_impl(X const& x, Y const& y) {
+            return and_(
+                equal(first(x), first(y)),
+                equal(second(x), second(y))
+            );
+        }
+    };
+
+    //! Instance of `Comparable` for `Product`s.
+    //!
+    //! Two products `x` and `y` are equal iff they are equal element-wise,
+    //! i.e. iff
+    //! @code
+    //!     first(x) == first(y) && second(x) == second(y)
+    //! @endcode
+    //!
+    //! ### Example
+    //! @snippet example/product.cpp comparable
+    template <typename T, typename U>
+    struct Comparable::instance<T, U, when<
+        is_a<Product, T>() && is_a<Product, U>()
+    >> : Comparable::product_mcd { };
+
+    struct Foldable::product_mcd : Foldable::unpack_mcd {
+        template <typename P, typename F>
+        static constexpr decltype(auto) unpack_impl(P&& p, F&& f) {
+            return detail::std::forward<F>(f)(
+                first(detail::std::forward<P>(p)),
+                second(detail::std::forward<P>(p))
+            );
+        }
+    };
+
+    //! Minimal complete definition of `Foldable` for `Product`s.
+    //!
+    //! Folding a `Product` `p` is equivalent to folding a list containing
+    //! `first(p)` and `second(p)`, in that order.
+    template <typename P>
+    struct Foldable::instance<P, when<is_a<Product, P>()>>
+        : Foldable::product_mcd
+    { };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_PRODUCT_HPP
diff --git a/include/boost/hana/product/mcd.hpp b/include/boost/hana/product/mcd.hpp
deleted file mode 100644
index b70136f28..000000000
--- a/include/boost/hana/product/mcd.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Product::mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_PRODUCT_MCD_HPP
-#define BOOST_HANA_PRODUCT_MCD_HPP
-
-#include <boost/hana/product/product.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition: `first`, `second` and `make`.
-    struct Product::mcd { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_PRODUCT_MCD_HPP
diff --git a/include/boost/hana/range.hpp b/include/boost/hana/range.hpp
index 7bda8549b..68df08f98 100644
--- a/include/boost/hana/range.hpp
+++ b/include/boost/hana/range.hpp
@@ -10,11 +10,172 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_RANGE_HPP
 #define BOOST_HANA_RANGE_HPP
 
-#include <boost/hana/range/range.hpp>
+#include <boost/hana/fwd/range.hpp>
 
-// Instances
-#include <boost/hana/range/comparable.hpp>
-#include <boost/hana/range/foldable.hpp>
-#include <boost/hana/range/iterable.hpp>
+#include <boost/hana/comparable.hpp>
+#include <boost/hana/constant.hpp>
+#include <boost/hana/core/datatype.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+#include <boost/hana/detail/std/integer_sequence.hpp>
+#include <boost/hana/enumerable.hpp>
+#include <boost/hana/group.hpp>
+#include <boost/hana/integral.hpp>
+#include <boost/hana/integral_constant.hpp>
+#include <boost/hana/iterable.hpp>
+#include <boost/hana/logical.hpp>
+#include <boost/hana/monoid.hpp>
+#include <boost/hana/orderable.hpp>
+
+// instances
+#include <boost/hana/comparable.hpp>
+#include <boost/hana/foldable.hpp>
+#include <boost/hana/iterable.hpp>
+
+
+namespace boost { namespace hana {
+    //! Instance of `Comparable` for `Range`s.
+    //!
+    //! Two ranges are equal if and only if they are both empty or they have
+    //! the same `head` and the same length.
+    template <>
+    struct Comparable::instance<Range, Range> : Comparable::equal_mcd {
+        template <typename R1, typename R2>
+        static constexpr auto equal_impl(R1 r1, R2 r2) {
+            return or_(
+                and_(is_empty(r1), is_empty(r2)),
+                and_(
+                    equal(r1.from, r2.from),
+                    equal(r1.to, r2.to)
+                )
+            );
+        }
+    };
+
+    //! Instance of `Foldable` for `Range`s.
+    template <>
+    struct Foldable::instance<Range> : Foldable::unpack_mcd {
+        template <typename F, typename From, typename T, T ...vs>
+        static constexpr decltype(auto)
+        unpack_helper(F&& f, From from, detail::std::integer_sequence<T, vs...>) {
+            return detail::std::forward<F>(f)(integral<T, from() + vs>...);
+        }
+
+        template <typename R, typename F>
+        static constexpr decltype(auto) unpack_impl(R r, F&& f) {
+            auto size = minus(r.to, r.from);
+            return unpack_helper(detail::std::forward<F>(f), r.from,
+                detail::std::make_index_sequence<size()>{});
+        }
+
+        template <typename R>
+        static constexpr auto length_impl(R r)
+        { return minus(r.to, r.from); }
+
+        template <typename R>
+        static constexpr auto minimum_impl(R r)
+        { return r.from; }
+
+        template <typename R>
+        static constexpr auto maximum_impl(R r)
+        { return pred(r.to); }
+
+        // Returns the sum of `[m, n]`, where `m <= n` always hold.
+        template <typename I>
+        static constexpr I sum_helper(I m, I n) {
+            if (m == n)
+                return m;
+
+            // 0 == m < n
+            else if (0 == m)
+                return n * (n+1) / 2;
+
+            // 0 < m < n
+            else if (0 < m)
+                return sum_helper(0, n) - sum_helper(0, m-1);
+
+            // m < 0 <= n
+            else if (0 <= n)
+                return sum_helper(0, n) - sum_helper(0, -m);
+
+            // m < n < 0
+            else
+                return -sum_helper(-n, -m);
+        }
+
+        template <typename R>
+        static constexpr auto sum_impl(R r) {
+            using I = datatype_t<decltype(r.from)>;
+            constexpr auto from = value(r.from);
+            constexpr auto to = value(r.to);
+            constexpr auto s = from == to ? 0 : sum_helper(from, to-1);
+            return integral_constant<I, decltype(s), s>;
+        }
+
+        // Returns the product of `[m, n)`, where `m <= n` always hold.
+        template <typename I>
+        static constexpr I product_helper(I m, I n) {
+            if (m <= 0 && 0 < n)
+                return 0;
+            else {
+                I p = 1;
+                for (; m != n; ++m)
+                    p *= m;
+                return p;
+            }
+        }
+
+        template <typename R>
+        static constexpr auto product_impl(R r) {
+            using I = datatype_t<decltype(r.from)>;
+            constexpr auto from = value(r.from);
+            constexpr auto to = value(r.to);
+            constexpr auto s = product_helper(from, to);
+            return integral_constant<I, decltype(s), s>;
+        }
+    };
+
+    //! Instance of `Iterable` for `Range`s.
+    //!
+    //! Let `r` be a `Range` containing the `Integral`s in the half-open
+    //! interval `[from, to)`. The head of `r` is an `Integral` with value
+    //! `from`, its tail is the range representing the `[from + 1, to)`
+    //! interval and `r` is empty if and only if `from == to`.
+    //!
+    //! @snippet example/range.cpp iterable
+    //!
+    //! @todo
+    //! Consider allowing the elements of the range to be any `Group`, since
+    //! we don't use much more than that (except `Comparable` and `Orderable`).
+    template <>
+    struct Iterable::instance<Range> : Iterable::mcd {
+        template <typename R>
+        static constexpr auto head_impl(R r)
+        { return r.from; }
+
+        //! @todo
+        //! We need a type class to express the concept of
+        //! incrementing and decrementing.
+        template <typename R>
+        static constexpr auto tail_impl(R r)
+        { return range(succ(r.from), r.to); }
+
+        template <typename R>
+        static constexpr auto is_empty_impl(R r)
+        { return equal(r.from, r.to); }
+
+        template <typename N, typename R>
+        static constexpr auto at_impl(N n, R r)
+        { return plus(r.from, n); }
+
+        template <typename R>
+        static constexpr auto last_impl(R r)
+        { return pred(r.to); }
+
+        template <typename N, typename R>
+        static constexpr auto drop_impl(N n, R r) {
+            return range(min(r.to, plus(r.from, n)), r.to);
+        }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_RANGE_HPP
diff --git a/include/boost/hana/range/comparable.hpp b/include/boost/hana/range/comparable.hpp
deleted file mode 100644
index 02b76eb1e..000000000
--- a/include/boost/hana/range/comparable.hpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Comparable` for `boost::hana::Range`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_RANGE_COMPARABLE_HPP
-#define BOOST_HANA_RANGE_COMPARABLE_HPP
-
-#include <boost/hana/comparable/equal_mcd.hpp>
-#include <boost/hana/iterable/iterable.hpp>
-#include <boost/hana/logical/logical.hpp>
-#include <boost/hana/range/iterable.hpp>
-#include <boost/hana/range/range.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Comparable` for `Range`s.
-    //!
-    //! Two ranges are equal if and only if they are both empty or they have
-    //! the same `head` and the same length.
-    template <>
-    struct Comparable::instance<Range, Range> : Comparable::equal_mcd {
-        template <typename R1, typename R2>
-        static constexpr auto equal_impl(R1 r1, R2 r2) {
-            return or_(
-                and_(is_empty(r1), is_empty(r2)),
-                and_(
-                    equal(r1.from, r2.from),
-                    equal(r1.to, r2.to)
-                )
-            );
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_RANGE_COMPARABLE_HPP
diff --git a/include/boost/hana/range/foldable.hpp b/include/boost/hana/range/foldable.hpp
deleted file mode 100644
index 9a407e826..000000000
--- a/include/boost/hana/range/foldable.hpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Foldable` for `boost::hana::Range`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_RANGE_FOLDABLE_HPP
-#define BOOST_HANA_RANGE_FOLDABLE_HPP
-
-#include <boost/hana/constant.hpp>
-#include <boost/hana/core/datatype.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/detail/std/integer_sequence.hpp>
-#include <boost/hana/foldable/unpack_mcd.hpp>
-#include <boost/hana/group/group.hpp>
-#include <boost/hana/integral.hpp>
-#include <boost/hana/integral_constant.hpp>
-#include <boost/hana/range/range.hpp>
-#include <boost/hana/ring/ring.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Foldable` for `Range`s.
-    template <>
-    struct Foldable::instance<Range> : Foldable::unpack_mcd {
-        template <typename F, typename From, typename T, T ...vs>
-        static constexpr decltype(auto)
-        unpack_helper(F&& f, From from, detail::std::integer_sequence<T, vs...>) {
-            return detail::std::forward<F>(f)(integral<T, from() + vs>...);
-        }
-
-        template <typename R, typename F>
-        static constexpr decltype(auto) unpack_impl(R r, F&& f) {
-            auto size = minus(r.to, r.from);
-            return unpack_helper(detail::std::forward<F>(f), r.from,
-                detail::std::make_index_sequence<size()>{});
-        }
-
-        template <typename R>
-        static constexpr auto length_impl(R r)
-        { return minus(r.to, r.from); }
-
-        template <typename R>
-        static constexpr auto minimum_impl(R r)
-        { return r.from; }
-
-        template <typename R>
-        static constexpr auto maximum_impl(R r)
-        { return minus(r.to, one<datatype_t<decltype(r.to)>>); }
-
-        // Returns the sum of `[m, n]`, where `m <= n` always hold.
-        template <typename I>
-        static constexpr I sum_helper(I m, I n) {
-            if (m == n)
-                return m;
-
-            // 0 == m < n
-            else if (0 == m)
-                return n * (n+1) / 2;
-
-            // 0 < m < n
-            else if (0 < m)
-                return sum_helper(0, n) - sum_helper(0, m-1);
-
-            // m < 0 <= n
-            else if (0 <= n)
-                return sum_helper(0, n) - sum_helper(0, -m);
-
-            // m < n < 0
-            else
-                return -sum_helper(-n, -m);
-        }
-
-        template <typename R>
-        static constexpr auto sum_impl(R r) {
-            using I = datatype_t<decltype(r.from)>;
-            constexpr auto from = value(r.from);
-            constexpr auto to = value(r.to);
-            constexpr auto s = from == to ? 0 : sum_helper(from, to-1);
-            return integral_constant<I, decltype(s), s>;
-        }
-
-        // Returns the product of `[m, n)`, where `m <= n` always hold.
-        template <typename I>
-        static constexpr I product_helper(I m, I n) {
-            if (m <= 0 && 0 < n)
-                return 0;
-            else {
-                I p = 1;
-                for (; m != n; ++m)
-                    p *= m;
-                return p;
-            }
-        }
-
-        template <typename R>
-        static constexpr auto product_impl(R r) {
-            using I = datatype_t<decltype(r.from)>;
-            constexpr auto from = value(r.from);
-            constexpr auto to = value(r.to);
-            constexpr auto s = product_helper(from, to);
-            return integral_constant<I, decltype(s), s>;
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_RANGE_FOLDABLE_HPP
diff --git a/include/boost/hana/range/iterable.hpp b/include/boost/hana/range/iterable.hpp
deleted file mode 100644
index 76b57a229..000000000
--- a/include/boost/hana/range/iterable.hpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Iterable` for `boost::hana::Range`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_RANGE_ITERABLE_HPP
-#define BOOST_HANA_RANGE_ITERABLE_HPP
-
-#include <boost/hana/comparable/comparable.hpp>
-#include <boost/hana/group/group.hpp>
-#include <boost/hana/integral.hpp>
-#include <boost/hana/iterable/mcd.hpp>
-#include <boost/hana/monoid/monoid.hpp>
-#include <boost/hana/orderable/orderable.hpp>
-#include <boost/hana/range/range.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Iterable` for `Range`s.
-    //!
-    //! Let `r` be a `Range` containing the `Integral`s in the half-open
-    //! interval `[from, to)`. The head of `r` is an `Integral` with value
-    //! `from`, its tail is the range representing the `[from + 1, to)`
-    //! interval and `r` is empty if and only if `from == to`.
-    //!
-    //! @snippet example/range.cpp iterable
-    //!
-    //! @todo
-    //! Consider allowing the elements of the range to be any `Group`, since
-    //! we don't use much more than that (except `Comparable` and `Orderable`).
-    template <>
-    struct Iterable::instance<Range> : Iterable::mcd {
-        template <typename R>
-        static constexpr auto head_impl(R r)
-        { return r.from; }
-
-        //! @todo
-        //! We need a type class to express the concept of
-        //! incrementing and decrementing.
-        template <typename R>
-        static constexpr auto tail_impl(R r)
-        { return range(plus(r.from, int_<1>), r.to); }
-
-        template <typename R>
-        static constexpr auto is_empty_impl(R r)
-        { return equal(r.from, r.to); }
-
-        template <typename N, typename R>
-        static constexpr auto at_impl(N n, R r)
-        { return plus(r.from, n); }
-
-        template <typename R>
-        static constexpr auto last_impl(R r)
-        { return minus(r.to, int_<1>); }
-
-        template <typename N, typename R>
-        static constexpr auto drop_impl(N n, R r) {
-            return range(min(r.to, plus(r.from, n)), r.to);
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_RANGE_ITERABLE_HPP
diff --git a/include/boost/hana/record.hpp b/include/boost/hana/record.hpp
index 13e58ffc7..696970cda 100644
--- a/include/boost/hana/record.hpp
+++ b/include/boost/hana/record.hpp
@@ -10,7 +10,114 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_RECORD_HPP
 #define BOOST_HANA_RECORD_HPP
 
-#include <boost/hana/record/mcd.hpp>
-#include <boost/hana/record/record.hpp>
+#include <boost/hana/fwd/record.hpp>
+
+#include <boost/hana/core/is_a.hpp>
+#include <boost/hana/core/when.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+#include <boost/hana/functor.hpp>
+#include <boost/hana/product.hpp>
+#include <boost/hana/searchable.hpp>
+
+// provided instances
+#include <boost/hana/comparable.hpp>
+#include <boost/hana/foldable.hpp>
+#include <boost/hana/searchable.hpp>
+
+
+namespace boost { namespace hana {
+    //! Minimal complete definition: `members`
+    struct Record::mcd { };
+
+    template <typename R>
+    struct Foldable::record_mcd : Foldable::folds_mcd {
+        template <typename Udt, typename S, typename F>
+        static constexpr decltype(auto) foldl_impl(Udt&& udt, S&& s, F&& f) {
+            return foldl(members<R>, detail::std::forward<S>(s),
+                [&udt, f(detail::std::forward<F>(f))]
+                (auto&& s, auto&& member) -> decltype(auto) {
+                    return f(
+                        detail::std::forward<decltype(s)>(s),
+                        second(detail::std::forward<decltype(member)>(member))(
+                            detail::std::forward<Udt>(udt)
+                        )
+                    );
+                }
+            );
+        }
+
+        template <typename Udt, typename S, typename F>
+        static constexpr decltype(auto) foldr_impl(Udt&& udt, S&& s, F&& f) {
+            return foldr(members<R>, detail::std::forward<S>(s),
+                [&udt, f(detail::std::forward<F>(f))]
+                (auto&& member, auto&& s) -> decltype(auto) {
+                    return f(
+                        second(detail::std::forward<decltype(member)>(member))(
+                            detail::std::forward<Udt>(udt)
+                        ),
+                        detail::std::forward<decltype(s)>(s)
+                    );
+                }
+            );
+        }
+    };
+
+    //! Folding a `Record` `R` is equivalent to folding a list of its members,
+    //! in the same order as they appear in `members<R>`.
+    template <typename R>
+    struct Foldable::instance<R, when<is_a<Record, R>()>>
+        : Foldable::record_mcd<R>
+    { };
+
+    template <typename R>
+    struct Comparable::record_mcd : Comparable::equal_mcd {
+        template <typename X, typename Y>
+        static constexpr decltype(auto) equal_impl(X const& x, Y const& y) {
+            return all(members<R>, [&x, &y](auto&& member) -> decltype(auto) {
+                auto accessor = second(detail::std::forward<decltype(member)>(member));
+                return equal(accessor(x), accessor(y));
+            });
+        }
+    };
+
+    //! Two `Records` of the same data type `R` are equal if and only if
+    //! all their members are equal. The members are compared in the
+    //! same order as they appear in `members<R>`.
+    template <typename R>
+    struct Comparable::instance<R, R, when<is_a<Record, R>()>>
+        : Comparable::record_mcd<R>
+    { };
+
+    //! Minimal complete definition: `Record`
+    template <typename R>
+    struct Searchable::record_mcd : Searchable::mcd {
+        template <typename X, typename Pred>
+        static constexpr decltype(auto) find_impl(X&& x, Pred&& pred) {
+            return fmap(
+                find(members<R>, [&pred](auto&& member) -> decltype(auto) {
+                    return pred(first(detail::std::forward<decltype(member)>(member)));
+                }),
+                [&x](auto&& member) -> decltype(auto) {
+                    return second(detail::std::forward<decltype(member)>(member))(
+                        detail::std::forward<X>(x)
+                    );
+                }
+            );
+        }
+
+        template <typename X, typename Pred>
+        static constexpr decltype(auto) any_impl(X const&, Pred&& pred) {
+            return any(members<R>, [&pred](auto&& member) -> decltype(auto) {
+                return pred(first(detail::std::forward<decltype(member)>(member)));
+            });
+        }
+    };
+
+    //! Searching a `Record` `r` is equivalent to searching `to<Map>(r)`.
+    template <typename R>
+    struct Searchable::instance<R, when<is_a<Record, R>()>>
+        : Searchable::record_mcd<R>
+    { };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_RECORD_HPP
diff --git a/include/boost/hana/record/mcd.hpp b/include/boost/hana/record/mcd.hpp
deleted file mode 100644
index c15136461..000000000
--- a/include/boost/hana/record/mcd.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Record::mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_RECORD_MCD_HPP
-#define BOOST_HANA_RECORD_MCD_HPP
-
-#include <boost/hana/record/record.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition: `members`
-    struct Record::mcd { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_RECORD_MCD_HPP
diff --git a/include/boost/hana/record/macros.hpp b/include/boost/hana/record_macros.hpp
similarity index 98%
rename from include/boost/hana/record/macros.hpp
rename to include/boost/hana/record_macros.hpp
index 99b9f9ed0..0340e62a0 100644
--- a/include/boost/hana/record/macros.hpp
+++ b/include/boost/hana/record_macros.hpp
@@ -5,7 +5,7 @@ Defines the `BOOST_HANA_DEFINE_RECORD` and the
 
 @note
 This header carries a dependency on the Boost.Preprocessor library. For this
-reason, it is not included by default by boost/hana/record.hpp.
+reason, it is not included by default by the master header of the library.
 
 @copyright Louis Dionne 2014
 Distributed under the Boost Software License, Version 1.0.
@@ -19,7 +19,7 @@ Distributed under the Boost Software License, Version 1.0.
 #include <boost/hana/detail/std/forward.hpp>
 #include <boost/hana/functional/id.hpp>
 #include <boost/hana/pair.hpp>
-#include <boost/hana/record/mcd.hpp>
+#include <boost/hana/record.hpp>
 #include <boost/hana/string.hpp>
 #include <boost/hana/tuple.hpp>
 
diff --git a/include/boost/hana/ring.hpp b/include/boost/hana/ring.hpp
index 9efc858c0..491f77fac 100644
--- a/include/boost/hana/ring.hpp
+++ b/include/boost/hana/ring.hpp
@@ -10,9 +10,32 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_RING_HPP
 #define BOOST_HANA_RING_HPP
 
-#include <boost/hana/ring/integral_constant_mcd.hpp>
-#include <boost/hana/ring/mcd.hpp>
-#include <boost/hana/ring/operators.hpp>
-#include <boost/hana/ring/ring.hpp>
+#include <boost/hana/fwd/ring.hpp>
+
+#include <boost/hana/core/datatype.hpp>
+#include <boost/hana/core/operators.hpp>
+#include <boost/hana/detail/std/enable_if.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+
+
+namespace boost { namespace hana {
+    //! Minimal complete definition : `one` and `mult`
+    struct Ring::mcd { };
+
+    namespace operators {
+        //! Equivalent to `mult`.
+        //! @relates boost::hana::Ring
+        template <typename X, typename Y, typename = typename detail::std::enable_if<
+            enable_operators<Ring, datatype_t<X>>::value ||
+            enable_operators<Ring, datatype_t<Y>>::value
+        >::type>
+        constexpr decltype(auto) operator*(X&& x, Y&& y) {
+            return mult(
+                detail::std::forward<decltype(x)>(x),
+                detail::std::forward<decltype(y)>(y)
+            );
+        }
+    }
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_RING_HPP
diff --git a/include/boost/hana/ring/integral_constant_mcd.hpp b/include/boost/hana/ring/integral_constant_mcd.hpp
deleted file mode 100644
index a38e641de..000000000
--- a/include/boost/hana/ring/integral_constant_mcd.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Ring::integral_constant_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_RING_INTEGRAL_CONSTANT_MCD_HPP
-#define BOOST_HANA_RING_INTEGRAL_CONSTANT_MCD_HPP
-
-#include <boost/hana/constant/constant.hpp>
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/detail/constexpr.hpp>
-#include <boost/hana/detail/std/is_integral.hpp>
-#include <boost/hana/integral_constant/integral_constant.hpp>
-#include <boost/hana/ring/mcd.hpp>
-
-
-namespace boost { namespace hana {
-    //! Any two `IntegralConstant`s form a multiplicative `Ring`.
-    template <typename I1, typename I2>
-    struct Ring::integral_constant_mcd : Ring::mcd {
-        template <typename X, typename Y>
-        static constexpr auto mult_impl(X x, Y y) {
-            constexpr auto prod = value(x) * value(y);
-            return integral_constant<I1, decltype(prod), prod>;
-        }
-
-        static BOOST_HANA_CONSTEXPR_LAMBDA auto one_impl()
-        { return integral_constant<I1, int, 1>; }
-    };
-
-    template <typename I, typename T>
-    struct Ring::instance<I, T, when<
-        is_an<IntegralConstant, I>() &&
-        detail::std::is_integral<T>{}
-    >>
-        : Ring::mcd
-    {
-        template <typename X, typename Y>
-        static constexpr auto mult_impl(X x, Y y)
-        { return value(x) * y; }
-    };
-
-    template <typename T, typename I>
-    struct Ring::instance<T, I, when<
-        detail::std::is_integral<T>{} &&
-        is_an<IntegralConstant, I>()
-    >>
-        : Ring::mcd
-    {
-        template <typename X, typename Y>
-        static constexpr auto mult_impl(X x, Y y)
-        { return x * value(y); }
-    };
-
-    template <typename I1, typename I2>
-    struct Ring::instance<I1, I2, when<
-        is_an<IntegralConstant, I1>() &&
-        is_an<IntegralConstant, I2>()
-    >>
-        : Ring::integral_constant_mcd<I1, I2>
-    { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_RING_INTEGRAL_CONSTANT_MCD_HPP
diff --git a/include/boost/hana/ring/mcd.hpp b/include/boost/hana/ring/mcd.hpp
deleted file mode 100644
index c2921cb71..000000000
--- a/include/boost/hana/ring/mcd.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Ring::mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_RING_MCD_HPP
-#define BOOST_HANA_RING_MCD_HPP
-
-#include <boost/hana/ring/ring.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition : `one` and `mult`
-    struct Ring::mcd { };
-}}
-
-#endif // !BOOST_HANA_RING_MCD_HPP
diff --git a/include/boost/hana/ring/operators.hpp b/include/boost/hana/ring/operators.hpp
deleted file mode 100644
index 98371a5f4..000000000
--- a/include/boost/hana/ring/operators.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*!
-@file
-Defines custom operators for `boost::hana::Ring`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_RING_OPERATORS_HPP
-#define BOOST_HANA_RING_OPERATORS_HPP
-
-#include <boost/hana/ring/ring.hpp>
-
-#include <boost/hana/core/datatype.hpp>
-#include <boost/hana/core/operators.hpp>
-#include <boost/hana/detail/std/enable_if.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-
-
-namespace boost { namespace hana { namespace operators {
-    //! Equivalent to `mult`.
-    //! @relates boost::hana::Ring
-    template <typename X, typename Y, typename = detail::std::enable_if_t<
-        enable_operators<Ring, datatype_t<X>>::value ||
-        enable_operators<Ring, datatype_t<Y>>::value
-    >>
-    constexpr decltype(auto) operator*(X&& x, Y&& y) {
-        return mult(
-            detail::std::forward<decltype(x)>(x),
-            detail::std::forward<decltype(y)>(y)
-        );
-    }
-}}} // end namespace boost::hana::operators
-
-#endif // !BOOST_HANA_RING_OPERATORS_HPP
diff --git a/include/boost/hana/sandbox/hash_map.hpp b/include/boost/hana/sandbox/hash_map.hpp
index 11967afd0..95ede88bd 100644
--- a/include/boost/hana/sandbox/hash_map.hpp
+++ b/include/boost/hana/sandbox/hash_map.hpp
@@ -11,12 +11,12 @@ Distributed under the Boost Software License, Version 1.0.
 #define BOOST_HANA_HASH_MAP_HPP
 
 #include <boost/hana/detail/constexpr.hpp>
-#include <boost/hana/foldable/folds_mcd.hpp>
+#include <boost/hana/foldable.hpp>
 #include <boost/hana/functional.hpp>
-#include <boost/hana/logical/logical.hpp>
+#include <boost/hana/logical.hpp>
 #include <boost/hana/maybe.hpp>
 #include <boost/hana/pair.hpp>
-#include <boost/hana/searchable/mcd.hpp>
+#include <boost/hana/searchable.hpp>
 #include <boost/hana/tuple.hpp>
 
 
diff --git a/include/boost/hana/sandbox/monad_zero.hpp b/include/boost/hana/sandbox/monad_zero.hpp
index c916adf1c..4fd1bd9bb 100644
--- a/include/boost/hana/sandbox/monad_zero.hpp
+++ b/include/boost/hana/sandbox/monad_zero.hpp
@@ -10,11 +10,11 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_MONAD_ZERO_HPP
 #define BOOST_HANA_MONAD_ZERO_HPP
 
-#include <boost/hana/applicative/applicative.hpp>
+#include <boost/hana/applicative.hpp>
 #include <boost/hana/core/typeclass.hpp>
 #include <boost/hana/detail/constexpr.hpp>
-#include <boost/hana/logical/logical.hpp>
-#include <boost/hana/monad/monad.hpp>
+#include <boost/hana/logical.hpp>
+#include <boost/hana/monad.hpp>
 
 
 namespace boost { namespace hana {
diff --git a/include/boost/hana/sandbox/searchable_set.hpp b/include/boost/hana/sandbox/searchable_set.hpp
index 2a3a7df98..b0ee7cad0 100644
--- a/include/boost/hana/sandbox/searchable_set.hpp
+++ b/include/boost/hana/sandbox/searchable_set.hpp
@@ -10,15 +10,15 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_SANDBOX_SEARCHABLE_SET_HPP
 #define BOOST_HANA_SANDBOX_SEARCHABLE_SET_HPP
 
-#include <boost/hana/applicative/mcd.hpp>
-#include <boost/hana/comparable/equal_mcd.hpp>
+#include <boost/hana/applicative.hpp>
+#include <boost/hana/comparable.hpp>
 #include <boost/hana/core/operators.hpp>
 #include <boost/hana/detail/constexpr.hpp>
-#include <boost/hana/functor/fmap_mcd.hpp>
-#include <boost/hana/logical/logical.hpp>
+#include <boost/hana/functor.hpp>
+#include <boost/hana/logical.hpp>
 #include <boost/hana/maybe.hpp>
-#include <boost/hana/monad/flatten_mcd.hpp>
-#include <boost/hana/searchable/mcd.hpp>
+#include <boost/hana/monad.hpp>
+#include <boost/hana/searchable.hpp>
 
 
 namespace boost { namespace hana {
diff --git a/include/boost/hana/searchable.hpp b/include/boost/hana/searchable.hpp
index 45dd1a601..3dcf2841d 100644
--- a/include/boost/hana/searchable.hpp
+++ b/include/boost/hana/searchable.hpp
@@ -10,9 +10,58 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_SEARCHABLE_HPP
 #define BOOST_HANA_SEARCHABLE_HPP
 
-#include <boost/hana/searchable/list_mcd.hpp>
-#include <boost/hana/searchable/mcd.hpp>
-#include <boost/hana/searchable/record_mcd.hpp>
-#include <boost/hana/searchable/searchable.hpp>
+#include <boost/hana/fwd/searchable.hpp>
+
+#include <boost/hana/comparable.hpp>
+#include <boost/hana/logical.hpp>
+
+
+namespace boost { namespace hana {
+    //! Minimal complete definition: `find` and `any`
+    //!
+    //! @note
+    //! We could implement `any(pred, xs)` as `is_just(find(pred, xs))`, and
+    //! then reduce the MCD to `find`. However, this is not done because that
+    //! implementation requires the predicate to be compile-time, which is
+    //! more restrictive than the original `any` in `Foldable`.
+    //!
+    //! @todo
+    //! Use perfect forwarding once bug
+    //! http://llvm.org/bugs/show_bug.cgi?id=20619
+    //! is fixed.
+    struct Searchable::mcd {
+        template <typename Srch, typename X>
+        static constexpr auto elem_impl(Srch srch, X x)
+        { return any(srch, [=](auto y) { return equal(x, y); }); }
+
+        template <typename Srch, typename Pred>
+        static constexpr auto all_impl(Srch srch, Pred pred)
+        { return not_(any(srch, [=](auto x) { return not_(pred(x)); })); }
+
+        template <typename Srch, typename Pred>
+        static constexpr auto none_impl(Srch srch, Pred pred)
+        { return not_(any(srch, pred)); }
+
+        template <typename Srch>
+        static constexpr auto any_of_impl(Srch srch)
+        { return any(srch, [](auto x) { return x; }); }
+
+        template <typename Srch>
+        static constexpr auto all_of_impl(Srch srch)
+        { return all(srch, [](auto x) { return x; }); }
+
+        template <typename Srch>
+        static constexpr auto none_of_impl(Srch srch)
+        { return none(srch, [](auto x) { return x; }); }
+
+        template <typename Srch, typename Key>
+        static constexpr auto lookup_impl(Srch srch, Key key)
+        { return find(srch, [=](auto k) { return equal(key, k); }); }
+
+        template <typename Xs, typename Ys>
+        static constexpr auto subset_impl(Xs xs, Ys ys)
+        { return all(xs, [=](auto x) { return elem(ys, x); }); }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_SEARCHABLE_HPP
diff --git a/include/boost/hana/searchable/list_mcd.hpp b/include/boost/hana/searchable/list_mcd.hpp
deleted file mode 100644
index f15928e98..000000000
--- a/include/boost/hana/searchable/list_mcd.hpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Searchable::list_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_SEARCHABLE_LIST_MCD_HPP
-#define BOOST_HANA_SEARCHABLE_LIST_MCD_HPP
-
-#include <boost/hana/bool.hpp>
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/iterable/iterable.hpp>
-#include <boost/hana/list/list.hpp>
-#include <boost/hana/logical/logical.hpp>
-#include <boost/hana/maybe.hpp>
-#include <boost/hana/searchable/mcd.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition: `List`
-    //!
-    //! @todo
-    //! Use perfect forwarding once bug
-    //! http://llvm.org/bugs/show_bug.cgi?id=20619
-    //! is fixed.
-    struct Searchable::list_mcd : Searchable::mcd {
-        template <typename Xs, typename Pred>
-        static constexpr auto find_impl(Xs xs, Pred pred) {
-            auto e = drop_until(xs, pred);
-            return eval_if(is_empty(e),
-                [](auto) { return nothing; },
-                [=](auto _) { return just(_(head)(e)); }
-            );
-        }
-
-        template <typename Xs, typename Pred>
-        static constexpr auto any_impl(Xs xs, Pred pred) {
-            return eval_if(is_empty(xs),
-                [](auto _) { return false_; },
-                [=](auto _) {
-                    return eval_if(pred(_(head)(xs)),
-                        [=](auto _) { return true_; },
-                        [=](auto _) { return any_impl(_(tail)(xs), pred); }
-                    );
-                }
-            );
-        }
-    };
-
-    //! Instance of `Searchable` for `List`s.
-    //!
-    //! A `List` can be searched by doing a linear search in the elements,
-    //! with the keys and values being both the elements in the list.
-    //!
-    //! @todo
-    //! Technically, this can be implemented in `Iterable`. Should it?
-    //!
-    //! ### Example
-    //! @snippet example/list/searchable.cpp find
-    template <typename T>
-    struct Searchable::instance<T, when<is_a<List, T>()>>
-        : Searchable::list_mcd
-    { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_SEARCHABLE_LIST_MCD_HPP
diff --git a/include/boost/hana/searchable/mcd.hpp b/include/boost/hana/searchable/mcd.hpp
deleted file mode 100644
index 2eb7b40ef..000000000
--- a/include/boost/hana/searchable/mcd.hpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Searchable::mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_SEARCHABLE_MCD_HPP
-#define BOOST_HANA_SEARCHABLE_MCD_HPP
-
-#include <boost/hana/searchable/searchable.hpp>
-
-#include <boost/hana/comparable/comparable.hpp>
-#include <boost/hana/logical/logical.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition: `find` and `any`
-    //!
-    //! @note
-    //! We could implement `any(pred, xs)` as `is_just(find(pred, xs))`, and
-    //! then reduce the MCD to `find`. However, this is not done because that
-    //! implementation requires the predicate to be compile-time, which is
-    //! more restrictive than the original `any` in `Foldable`.
-    //!
-    //! @todo
-    //! Use perfect forwarding once bug
-    //! http://llvm.org/bugs/show_bug.cgi?id=20619
-    //! is fixed.
-    struct Searchable::mcd {
-        template <typename Srch, typename X>
-        static constexpr auto elem_impl(Srch srch, X x)
-        { return any(srch, [=](auto y) { return equal(x, y); }); }
-
-        template <typename Srch, typename Pred>
-        static constexpr auto all_impl(Srch srch, Pred pred)
-        { return not_(any(srch, [=](auto x) { return not_(pred(x)); })); }
-
-        template <typename Srch, typename Pred>
-        static constexpr auto none_impl(Srch srch, Pred pred)
-        { return not_(any(srch, pred)); }
-
-        template <typename Srch>
-        static constexpr auto any_of_impl(Srch srch)
-        { return any(srch, [](auto x) { return x; }); }
-
-        template <typename Srch>
-        static constexpr auto all_of_impl(Srch srch)
-        { return all(srch, [](auto x) { return x; }); }
-
-        template <typename Srch>
-        static constexpr auto none_of_impl(Srch srch)
-        { return none(srch, [](auto x) { return x; }); }
-
-        template <typename Srch, typename Key>
-        static constexpr auto lookup_impl(Srch srch, Key key)
-        { return find(srch, [=](auto k) { return equal(key, k); }); }
-
-        template <typename Xs, typename Ys>
-        static constexpr auto subset_impl(Xs xs, Ys ys)
-        { return all(xs, [=](auto x) { return elem(ys, x); }); }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_SEARCHABLE_MCD_HPP
diff --git a/include/boost/hana/searchable/record_mcd.hpp b/include/boost/hana/searchable/record_mcd.hpp
deleted file mode 100644
index 3a103c482..000000000
--- a/include/boost/hana/searchable/record_mcd.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Searchable::record_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_SEARCHABLE_RECORD_MCD_HPP
-#define BOOST_HANA_SEARCHABLE_RECORD_MCD_HPP
-
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/functor/functor.hpp>
-#include <boost/hana/product/product.hpp>
-#include <boost/hana/record/record.hpp>
-#include <boost/hana/searchable/mcd.hpp>
-#include <boost/hana/searchable/searchable.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition: `Record`
-    template <typename R>
-    struct Searchable::record_mcd : Searchable::mcd {
-        template <typename X, typename Pred>
-        static constexpr decltype(auto) find_impl(X&& x, Pred&& pred) {
-            return fmap(
-                find(members<R>, [&pred](auto&& member) -> decltype(auto) {
-                    return pred(first(detail::std::forward<decltype(member)>(member)));
-                }),
-                [&x](auto&& member) -> decltype(auto) {
-                    return second(detail::std::forward<decltype(member)>(member))(
-                        detail::std::forward<X>(x)
-                    );
-                }
-            );
-        }
-
-        template <typename X, typename Pred>
-        static constexpr decltype(auto) any_impl(X const&, Pred&& pred) {
-            return any(members<R>, [&pred](auto&& member) -> decltype(auto) {
-                return pred(first(detail::std::forward<decltype(member)>(member)));
-            });
-        }
-    };
-
-    //! Searching a `Record` `r` is equivalent to searching `to<Map>(r)`.
-    template <typename R>
-    struct Searchable::instance<R, when<is_a<Record, R>()>>
-        : Searchable::record_mcd<R>
-    { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_SEARCHABLE_RECORD_MCD_HPP
diff --git a/include/boost/hana/set.hpp b/include/boost/hana/set.hpp
index 72e6716cf..e6c66cba2 100644
--- a/include/boost/hana/set.hpp
+++ b/include/boost/hana/set.hpp
@@ -10,12 +10,109 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_SET_HPP
 #define BOOST_HANA_SET_HPP
 
-#include <boost/hana/set/convert.hpp>
-#include <boost/hana/set/insert.hpp>
-#include <boost/hana/set/set.hpp>
+#include <boost/hana/fwd/set.hpp>
 
-// Instances
-#include <boost/hana/set/comparable.hpp>
-#include <boost/hana/set/searchable.hpp>
+#include <boost/hana/core/convert.hpp>
+#include <boost/hana/core/is_a.hpp>
+#include <boost/hana/core/when.hpp>
+#include <boost/hana/detail/insert_fwd.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+#include <boost/hana/foldable.hpp>
+#include <boost/hana/functional/flip.hpp>
+#include <boost/hana/functional/id.hpp>
+#include <boost/hana/list.hpp>
+#include <boost/hana/logical.hpp>
+
+// instances
+#include <boost/hana/comparable.hpp>
+#include <boost/hana/searchable.hpp>
+
+
+namespace boost { namespace hana {
+    //! Two sets are equal iff they contain the same elements, regardless of
+    //! the order.
+    //!
+    //! ### Example
+    //! @snippet example/set.cpp comparable
+    template <>
+    struct Comparable::instance<Set, Set> : Comparable::equal_mcd {
+        template <typename S1, typename S2>
+        static constexpr decltype(auto) equal_impl(S1&& s1, S2&& s2) {
+            return and_(
+                equal(length(s1.storage), length(s2.storage)),
+                subset(detail::std::forward<S1>(s1), detail::std::forward<S2>(s2))
+            );
+        }
+    };
+
+    //! Converts a `Foldable` to a `Set`.
+    //! @relates Set
+    //!
+    //! If the foldable structure contains duplicates, the last one will
+    //! be the one appearing in the resulting set.
+    template <typename F>
+    struct convert<Set, F, when<is_a<Foldable, F>()>> {
+        template <typename Xs>
+        static constexpr decltype(auto) apply(Xs&& xs) {
+            return foldr(detail::std::forward<Xs>(xs), set(), flip(insert));
+        }
+    };
+
+    //! Converts a `Set` to a `List`.
+    //! @relates Set
+    //!
+    //! The order of the elements in the resulting list is unspecified.
+    template <typename L>
+    struct convert<L, Set, when<is_a<List, L>()>> {
+        template <typename Set>
+        static constexpr decltype(auto) apply(Set&& set)
+        { return to<L>(detail::std::forward<Set>(set).storage); }
+    };
+
+    template <>
+    struct insert_impl<Set> {
+        template <typename S, typename X>
+        static constexpr decltype(auto) apply(S&& set, X&& x) {
+            return eval_if(elem(set, x),
+                [&set](auto) -> decltype(auto) {
+                    return id(detail::std::forward<S>(set));
+                },
+                [&set, &x](auto _) -> decltype(auto) {
+                    return unpack(
+                        _(cons)(
+                            detail::std::forward<X>(x),
+                            detail::std::forward<S>(set).storage
+                        ),
+                        hana::set
+                    );
+                }
+            );
+        }
+    };
+
+    //! The keys and the values of a `Set` are its elements; the `Searchable` 
+    //! instance follows naturally from that.
+    //!
+    //! ### Example
+    //! @snippet example/set.cpp searchable
+    template <>
+    struct Searchable::instance<Set> : Searchable::mcd {
+        template <typename Set, typename Pred>
+        static constexpr decltype(auto) find_impl(Set&& set, Pred&& pred) {
+            return find(
+                detail::std::forward<Set>(set).storage,
+                detail::std::forward<Pred>(pred)
+            );
+        }
+
+        template <typename Set, typename Pred>
+        static constexpr decltype(auto) any_impl(Set&& set, Pred&& pred) {
+            return any(
+                detail::std::forward<Set>(set).storage,
+                detail::std::forward<Pred>(pred)
+            );
+        }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_SET_HPP
diff --git a/include/boost/hana/set/comparable.hpp b/include/boost/hana/set/comparable.hpp
deleted file mode 100644
index 3dc32995d..000000000
--- a/include/boost/hana/set/comparable.hpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Comparable` for `boost::hana::Set`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_SET_COMPARABLE_HPP
-#define BOOST_HANA_SET_COMPARABLE_HPP
-
-#include <boost/hana/comparable/equal_mcd.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/foldable/foldable.hpp>
-#include <boost/hana/logical/logical.hpp>
-#include <boost/hana/set/searchable.hpp>
-#include <boost/hana/set/set.hpp>
-
-
-namespace boost { namespace hana {
-    //! Two sets are equal iff they contain the same elements, regardless of
-    //! the order.
-    //!
-    //! ### Example
-    //! @snippet example/set.cpp comparable
-    template <>
-    struct Comparable::instance<Set, Set> : Comparable::equal_mcd {
-        template <typename S1, typename S2>
-        static constexpr decltype(auto) equal_impl(S1&& s1, S2&& s2) {
-            return and_(
-                equal(length(s1.storage), length(s2.storage)),
-                subset(detail::std::forward<S1>(s1), detail::std::forward<S2>(s2))
-            );
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_SET_COMPARABLE_HPP
diff --git a/include/boost/hana/set/convert.hpp b/include/boost/hana/set/convert.hpp
deleted file mode 100644
index 5ed656036..000000000
--- a/include/boost/hana/set/convert.hpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*!
-@file
-Defines conversions to and from a `boost::hana::Map`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_SET_CONVERT_HPP
-#define BOOST_HANA_SET_CONVERT_HPP
-
-#include <boost/hana/core/convert.hpp>
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/foldable/foldable.hpp>
-#include <boost/hana/functional/flip.hpp>
-#include <boost/hana/list/list.hpp>
-#include <boost/hana/set/insert.hpp>
-#include <boost/hana/set/set.hpp>
-
-
-namespace boost { namespace hana {
-    //! Converts a `Foldable` to a `Set`.
-    //! @relates Set
-    //!
-    //! If the foldable structure contains duplicates, the last one will
-    //! be the one appearing in the resulting set.
-    template <typename F>
-    struct convert<Set, F, when<is_a<Foldable, F>()>> {
-        template <typename Xs>
-        static constexpr decltype(auto) apply(Xs&& xs) {
-            return foldr(detail::std::forward<Xs>(xs), set(), flip(insert));
-        }
-    };
-
-    //! Converts a `Set` to a `List`.
-    //! @relates Set
-    //!
-    //! The order of the elements in the resulting list is unspecified.
-    template <typename L>
-    struct convert<L, Set, when<is_a<List, L>()>> {
-        template <typename Set>
-        static constexpr decltype(auto) apply(Set&& set)
-        { return to<L>(detail::std::forward<Set>(set).storage); }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_SET_CONVERT_HPP
diff --git a/include/boost/hana/set/insert.hpp b/include/boost/hana/set/insert.hpp
deleted file mode 100644
index e109a447d..000000000
--- a/include/boost/hana/set/insert.hpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*!
-@file
-Defines `boost::hana::insert` for `boost::hana::Set`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_SET_INSERT_HPP
-#define BOOST_HANA_SET_INSERT_HPP
-
-#include <boost/hana/detail/insert_fwd.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/foldable/foldable.hpp>
-#include <boost/hana/functional/id.hpp>
-#include <boost/hana/list/list.hpp>
-#include <boost/hana/logical/logical.hpp>
-#include <boost/hana/set/searchable.hpp>
-#include <boost/hana/set/set.hpp>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct insert_impl<Set> {
-        template <typename S, typename X>
-        static constexpr decltype(auto) apply(S&& set, X&& x) {
-            return eval_if(elem(set, x),
-                [&set](auto) -> decltype(auto) {
-                    return id(detail::std::forward<S>(set));
-                },
-                [&set, &x](auto _) -> decltype(auto) {
-                    return unpack(
-                        _(cons)(
-                            detail::std::forward<X>(x),
-                            detail::std::forward<S>(set).storage
-                        ),
-                        hana::set
-                    );
-                }
-            );
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_SET_INSERT_HPP
diff --git a/include/boost/hana/set/searchable.hpp b/include/boost/hana/set/searchable.hpp
deleted file mode 100644
index 59b7944bd..000000000
--- a/include/boost/hana/set/searchable.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Searchable` for `boost::hana::Set`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_SET_SEARCHABLE_HPP
-#define BOOST_HANA_SET_SEARCHABLE_HPP
-
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/searchable/mcd.hpp>
-#include <boost/hana/set/set.hpp>
-
-
-namespace boost { namespace hana {
-    //! The keys and the values of a `Set` are its elements; the `Searchable` 
-    //! instance follows naturally from that.
-    //!
-    //! ### Example
-    //! @snippet example/set.cpp searchable
-    template <>
-    struct Searchable::instance<Set> : Searchable::mcd {
-        template <typename Set, typename Pred>
-        static constexpr decltype(auto) find_impl(Set&& set, Pred&& pred) {
-            return find(
-                detail::std::forward<Set>(set).storage,
-                detail::std::forward<Pred>(pred)
-            );
-        }
-
-        template <typename Set, typename Pred>
-        static constexpr decltype(auto) any_impl(Set&& set, Pred&& pred) {
-            return any(
-                detail::std::forward<Set>(set).storage,
-                detail::std::forward<Pred>(pred)
-            );
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_SET_SEARCHABLE_HPP
diff --git a/include/boost/hana/string.hpp b/include/boost/hana/string.hpp
index 372142d0f..6522ca240 100644
--- a/include/boost/hana/string.hpp
+++ b/include/boost/hana/string.hpp
@@ -10,15 +10,187 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_STRING_HPP
 #define BOOST_HANA_STRING_HPP
 
-#include <boost/hana/string/string.hpp>
-#include <boost/hana/string/convert.hpp>
+#include <boost/hana/fwd/string.hpp>
 
-// Instances
-#include <boost/hana/string/comparable.hpp>
-#include <boost/hana/string/constant.hpp>
-#include <boost/hana/string/foldable.hpp>
-#include <boost/hana/string/iterable.hpp>
-#include <boost/hana/string/orderable.hpp>
-#include <boost/hana/string/searchable.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+#include <boost/hana/detail/std/integer_sequence.hpp>
+#include <boost/hana/detail/std/size_t.hpp>
+#include <boost/hana/integral.hpp>
+
+//! @todo
+//! This enables conversion from any Foldable to a List, so String -> List
+//! works. It also contains Searchable::list_mcd, which is used as a hack
+//! below.
+#include <boost/hana/list.hpp>
+
+// instances
+#include <boost/hana/comparable.hpp>
+#include <boost/hana/constant.hpp>
+#include <boost/hana/foldable.hpp>
+#include <boost/hana/iterable.hpp>
+#include <boost/hana/orderable.hpp>
+#include <boost/hana/searchable.hpp>
+
+
+namespace boost { namespace hana {
+    namespace string_detail {
+        constexpr bool equal(char const* s1, char const* s2) {
+            while (*s1 != '\0' && *s2 != '\0')
+                if (*s1++ != *s2++)
+                    return false;
+            return *s1 == '\0' && *s2 == '\0';
+        }
+
+        constexpr detail::std::size_t length(char const* s) {
+            detail::std::size_t l = 0;
+            while (*s++ != '\0')
+                ++l;
+            return l;
+        }
+
+        constexpr bool less(char const* s1, char const* s2) {
+            while (*s1 != '\0' && *s2 != '\0' && *s1 == *s2)
+                ++s1, ++s2;
+
+            return (*s1 == '\0' && *s2 != '\0') || // s1 is shorter than s2
+                   (*s1 != '\0' && *s2 != '\0' && *s1 < *s2); // s1[0] < s2[0]
+        }
+    }
+
+    //! Instance of `Comparable` for `String`s.
+    //!
+    //! Two `String`s are equal if and only if each of their
+    //! characters are equal.
+    //!
+    //! ### Example
+    //! @snippet example/string/comparable.cpp main
+    template <>
+    struct Comparable::instance<String, String> : Comparable::equal_mcd {
+        template <typename S1, typename S2>
+        static constexpr auto equal_impl(S1 const&, S2 const&) {
+            constexpr char const* s1 = S1::get();
+            constexpr char const* s2 = S2::get();
+            return bool_<string_detail::equal(s1, s2)>;
+        }
+    };
+
+    //! Instance of `Constant` for `String`s.
+    //!
+    //! A `String`'s compile-time value is a `constexpr char*` to its
+    //! internal data.
+    //!
+    //! ### Example
+    //! @snippet example/string/constant.cpp main
+    template <>
+    struct Constant::instance<String> : Constant::mcd {
+        template <typename S>
+        static constexpr auto value_impl(S const&) {
+            return S::get();
+        }
+    };
+
+    //! Instance of `Foldable` for `String`s.
+    //!
+    //! For the purpose of being folded, `String`s are basically equivalent to
+    //! a tuple in which `IntegralConstant`s of underlying type `char` are
+    //! stored.
+    //!
+    //! ### Example
+    //! @snippet example/string/foldable.cpp main
+    template <>
+    struct Foldable::instance<String> : Foldable::unpack_mcd {
+        template <typename S, typename F, detail::std::size_t ...i>
+        static constexpr decltype(auto) unpack_helper(S, F&& f,
+                                            detail::std::index_sequence<i...>)
+        {
+            constexpr char const* s = S::get();
+            return detail::std::forward<F>(f)(char_<s[i]>...);
+        }
+
+        template <typename S, typename F>
+        static constexpr decltype(auto) unpack_impl(S s, F&& f) {
+            return unpack_helper(s, detail::std::forward<F>(f),
+                detail::std::make_index_sequence<string_detail::length(S::get())>{}
+            );
+        }
+
+        template <typename S>
+        static constexpr auto length_impl(S) {
+            return size_t<string_detail::length(S::get())>;
+        }
+    };
+
+    //! Instance of `Iterable` for `String`s.
+    //!
+    //! For the purpose of being iterated over, `String`s are basically
+    //! equivalent to a tuple of `IntegralConstant`s with an underlying
+    //! type of `char`.
+    //!
+    //! ### Example
+    //! @snippet example/string/iterable.cpp main
+    template <>
+    struct Iterable::instance<String> : Iterable::mcd {
+        template <typename S>
+        static constexpr auto head_impl(S) {
+            return char_<S::get()[0]>;
+        }
+
+        template <typename S, detail::std::size_t ...i>
+        static constexpr auto tail_helper(S, detail::std::index_sequence<i...>) {
+            return string<S::get()[i+1]...>;
+        }
+
+        template <typename S>
+        static constexpr auto tail_impl(S s) {
+            return tail_helper(s, detail::std::make_index_sequence<
+                string_detail::length(S::get()) - 1
+            >{});
+        }
+
+        template <typename S>
+        static constexpr auto is_empty_impl(S) {
+            return bool_<S::get()[0] == '\0'>;
+        }
+
+        template <typename I, typename S>
+        static constexpr auto at_impl(I index, S) {
+            constexpr auto i = value(index);
+            return char_<S::get()[i]>;
+        }
+    };
+
+    //! Instance of `Orderable` for `String`s.
+    //!
+    //! The strict weak ordering implemented for `Orderable` is the usual
+    //! lexicographical comparison.
+    //!
+    //! ### Example
+    //! @snippet example/string/orderable.cpp main
+    template <>
+    struct Orderable::instance<String, String> : Orderable::less_mcd {
+        template <typename S1, typename S2>
+        static constexpr auto less_impl(S1 const&, S2 const&) {
+            constexpr char const* s1 = S1::get();
+            constexpr char const* s2 = S2::get();
+            return bool_<string_detail::less(s1, s2)>;
+        }
+    };
+
+    //! Instance of `Searchable` for `String`s.
+    //!
+    //! For the purpose of being searched, `String`s are basically equivalent
+    //! to a tuple of `IntegralConstant`s of underlying type `char`.
+    //!
+    //! ### Example
+    //! @snippet example/string/searchable.cpp main
+    //!
+    //! @todo
+    //! Don't use the `list_mcd`, or make it an `iterable_mcd`.
+    template <>
+    struct Searchable::instance<String>
+        : Searchable::list_mcd
+    { };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_STRING_HPP
diff --git a/include/boost/hana/string/comparable.hpp b/include/boost/hana/string/comparable.hpp
deleted file mode 100644
index d8f2c3655..000000000
--- a/include/boost/hana/string/comparable.hpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Comparable` for `boost::hana::String`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_STRING_COMPARABLE_HPP
-#define BOOST_HANA_STRING_COMPARABLE_HPP
-
-#include <boost/hana/bool.hpp>
-#include <boost/hana/comparable/equal_mcd.hpp>
-#include <boost/hana/string/string.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Comparable` for `String`s.
-    //!
-    //! Two `String`s are equal if and only if each of their
-    //! characters are equal.
-    //!
-    //! ### Example
-    //! @snippet example/string/comparable.cpp main
-    template <>
-    struct Comparable::instance<String, String> : Comparable::equal_mcd {
-    private:
-        static constexpr bool strequal(char const* s1, char const* s2) {
-            while (*s1 != '\0' && *s2 != '\0')
-                if (*s1++ != *s2++)
-                    return false;
-            return *s1 == '\0' && *s2 == '\0';
-        }
-
-    public:
-        template <typename S1, typename S2>
-        static constexpr auto equal_impl(S1 const&, S2 const&) {
-            constexpr char const* s1 = S1::get();
-            constexpr char const* s2 = S2::get();
-            return bool_<strequal(s1, s2)>;
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_STRING_COMPARABLE_HPP
diff --git a/include/boost/hana/string/constant.hpp b/include/boost/hana/string/constant.hpp
deleted file mode 100644
index cc27a96fc..000000000
--- a/include/boost/hana/string/constant.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Constant` for `boost::hana::String`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_STRING_CONSTANT_HPP
-#define BOOST_HANA_STRING_CONSTANT_HPP
-
-#include <boost/hana/constant/mcd.hpp>
-#include <boost/hana/string/string.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Constant` for `String`s.
-    //!
-    //! A `String`'s compile-time value is a `constexpr char*` to its
-    //! internal data.
-    //!
-    //! ### Example
-    //! @snippet example/string/constant.cpp main
-    template <>
-    struct Constant::instance<String> : Constant::mcd {
-        template <typename S>
-        static constexpr auto value_impl(S const&) {
-            return S::get();
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_STRING_CONSTANT_HPP
diff --git a/include/boost/hana/string/convert.hpp b/include/boost/hana/string/convert.hpp
deleted file mode 100644
index ec20f8f09..000000000
--- a/include/boost/hana/string/convert.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines conversions to and from `boost::hana::String`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_STRING_CONVERT_HPP
-#define BOOST_HANA_STRING_CONVERT_HPP
-
-// Enables conversion from any Foldable to a List, so String -> List works.
-#include <boost/hana/list/convert.hpp>
-#include <boost/hana/string/foldable.hpp>
-
-#endif // !BOOST_HANA_STRING_CONVERT_HPP
diff --git a/include/boost/hana/string/foldable.hpp b/include/boost/hana/string/foldable.hpp
deleted file mode 100644
index 08c5b4030..000000000
--- a/include/boost/hana/string/foldable.hpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Foldable` for `boost::hana::String`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_STRING_FOLDABLE_HPP
-#define BOOST_HANA_STRING_FOLDABLE_HPP
-
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/detail/std/integer_sequence.hpp>
-#include <boost/hana/detail/std/size_t.hpp>
-#include <boost/hana/foldable/unpack_mcd.hpp>
-#include <boost/hana/integral.hpp> // for char_, size_t
-#include <boost/hana/string/string.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Foldable` for `String`s.
-    //!
-    //! For the purpose of being folded, `String`s are basically equivalent to
-    //! a tuple in which `IntegralConstant`s of underlying type `char` are
-    //! stored.
-    //!
-    //! ### Example
-    //! @snippet example/string/foldable.cpp main
-    template <>
-    struct Foldable::instance<String> : Foldable::unpack_mcd {
-    private:
-        static constexpr detail::std::size_t strlen(char const* s) {
-            detail::std::size_t l = 0;
-            while (*s++ != '\0')
-                ++l;
-            return l;
-        }
-
-        template <typename S, typename F, detail::std::size_t ...i>
-        static constexpr decltype(auto) unpack_helper(S, F&& f,
-                                            detail::std::index_sequence<i...>)
-        {
-            constexpr char const* s = S::get();
-            return detail::std::forward<F>(f)(char_<s[i]>...);
-        }
-
-    public:
-        template <typename S, typename F>
-        static constexpr decltype(auto) unpack_impl(S s, F&& f) {
-            return unpack_helper(s, detail::std::forward<F>(f),
-                detail::std::make_index_sequence<strlen(S::get())>{}
-            );
-        }
-
-        template <typename S>
-        static constexpr auto length_impl(S) {
-            return size_t<strlen(S::get())>;
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_STRING_FOLDABLE_HPP
diff --git a/include/boost/hana/string/iterable.hpp b/include/boost/hana/string/iterable.hpp
deleted file mode 100644
index 284520f70..000000000
--- a/include/boost/hana/string/iterable.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Iterable` for `boost::hana::String`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_STRING_ITERABLE_HPP
-#define BOOST_HANA_STRING_ITERABLE_HPP
-
-#include <boost/hana/bool.hpp>
-#include <boost/hana/constant/constant.hpp>
-#include <boost/hana/detail/std/integer_sequence.hpp>
-#include <boost/hana/detail/std/size_t.hpp>
-#include <boost/hana/integral.hpp> // for char_
-#include <boost/hana/iterable/mcd.hpp>
-#include <boost/hana/string/string.hpp>
-
-#include <boost/hana/core/operators.hpp>
-#include <boost/hana/iterable/operators.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Iterable` for `String`s.
-    //!
-    //! For the purpose of being iterated over, `String`s are basically
-    //! equivalent to a tuple of `IntegralConstant`s with an underlying
-    //! type of `char`.
-    //!
-    //! ### Example
-    //! @snippet example/string/iterable.cpp main
-    //!
-    //! @todo Don't duplicate `strlen`. Create generic constexpr algorithms
-    //! in detail/ and use them.
-    template <>
-    struct Iterable::instance<String> : Iterable::mcd {
-    private:
-        static constexpr detail::std::size_t strlen(char const* s) {
-            detail::std::size_t l = 0;
-            while (*s++ != '\0')
-                ++l;
-            return l;
-        }
-
-    public:
-        template <typename S>
-        static constexpr auto head_impl(S) {
-            return char_<S::get()[0]>;
-        }
-
-        template <typename S, detail::std::size_t ...i>
-        static constexpr auto tail_helper(S, detail::std::index_sequence<i...>) {
-            return string<S::get()[i+1]...>;
-        }
-
-        template <typename S>
-        static constexpr auto tail_impl(S s) {
-            return tail_helper(s,
-                detail::std::make_index_sequence<strlen(S::get()) - 1>{});
-        }
-
-        template <typename S>
-        static constexpr auto is_empty_impl(S) {
-            return bool_<S::get()[0] == '\0'>;
-        }
-
-        template <typename I, typename S>
-        static constexpr auto at_impl(I index, S) {
-            constexpr auto i = value(index);
-            return char_<S::get()[i]>;
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_STRING_ITERABLE_HPP
diff --git a/include/boost/hana/string/orderable.hpp b/include/boost/hana/string/orderable.hpp
deleted file mode 100644
index a41bd0502..000000000
--- a/include/boost/hana/string/orderable.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Orderable` for `boost::hana::String`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_STRING_ORDERABLE_HPP
-#define BOOST_HANA_STRING_ORDERABLE_HPP
-
-#include <boost/hana/bool.hpp>
-#include <boost/hana/orderable/less_mcd.hpp>
-#include <boost/hana/string/string.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Orderable` for `String`s.
-    //!
-    //! The strict weak ordering implemented for `Orderable` is the usual
-    //! lexicographical comparison.
-    //!
-    //! ### Example
-    //! @snippet example/string/orderable.cpp main
-    template <>
-    struct Orderable::instance<String, String> : Orderable::less_mcd {
-    private:
-        static constexpr bool strless(char const* s1, char const* s2) {
-            while (*s1 != '\0' && *s2 != '\0' && *s1 == *s2)
-                ++s1, ++s2;
-
-            return (*s1 == '\0' && *s2 != '\0') || // s1 is shorter than s2
-                   (*s1 != '\0' && *s2 != '\0' && *s1 < *s2); // s1[0] < s2[0]
-        }
-
-    public:
-        template <typename S1, typename S2>
-        static constexpr auto less_impl(S1 const&, S2 const&) {
-            constexpr char const* s1 = S1::get();
-            constexpr char const* s2 = S2::get();
-            return bool_<strless(s1, s2)>;
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_STRING_ORDERABLE_HPP
diff --git a/include/boost/hana/string/searchable.hpp b/include/boost/hana/string/searchable.hpp
deleted file mode 100644
index 240865e6e..000000000
--- a/include/boost/hana/string/searchable.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Searchable` for `boost::hana::String`s.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_STRING_SEARCHABLE_HPP
-#define BOOST_HANA_STRING_SEARCHABLE_HPP
-
-#include <boost/hana/string/iterable.hpp>
-#include <boost/hana/searchable/list_mcd.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Searchable` for `String`s.
-    //!
-    //! For the purpose of being searched, `String`s are basically equivalent
-    //! to a tuple of `IntegralConstant`s of underlying type `char`.
-    //!
-    //! ### Example
-    //! @snippet example/string/searchable.cpp main
-    //!
-    //! @todo
-    //! Don't use the `list_mcd`, or make it an `iterable_mcd`.
-    template <>
-    struct Searchable::instance<String>
-        : Searchable::list_mcd
-    { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_STRING_SEARCHABLE_HPP
diff --git a/include/boost/hana/traversable.hpp b/include/boost/hana/traversable.hpp
index a65762432..e7e7c625e 100644
--- a/include/boost/hana/traversable.hpp
+++ b/include/boost/hana/traversable.hpp
@@ -10,8 +10,18 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TRAVERSABLE_HPP
 #define BOOST_HANA_TRAVERSABLE_HPP
 
-#include <boost/hana/traversable/list_mcd.hpp>
-#include <boost/hana/traversable/traversable.hpp>
-#include <boost/hana/traversable/traverse_mcd.hpp>
+#include <boost/hana/fwd/traversable.hpp>
+
+#include <boost/hana/functional/id.hpp>
+
+
+namespace boost { namespace hana {
+    //! Minimal complete definition: `traverse`
+    struct Traversable::traverse_mcd {
+        template <typename A, typename T>
+        static constexpr auto sequence_impl(T traversable)
+        { return traverse<A>(traversable, id); }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_TRAVERSABLE_HPP
diff --git a/include/boost/hana/traversable/list_mcd.hpp b/include/boost/hana/traversable/list_mcd.hpp
deleted file mode 100644
index ddbe5c36d..000000000
--- a/include/boost/hana/traversable/list_mcd.hpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Traversable::list_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_TRAVERSABLE_LIST_MCD_HPP
-#define BOOST_HANA_TRAVERSABLE_LIST_MCD_HPP
-
-#include <boost/hana/applicative/applicative.hpp>
-#include <boost/hana/core/is_a.hpp>
-#include <boost/hana/core/when.hpp>
-#include <boost/hana/foldable/foldable.hpp>
-#include <boost/hana/functor/functor.hpp>
-#include <boost/hana/list/list.hpp>
-#include <boost/hana/traversable/traverse_mcd.hpp>
-
-
-namespace boost { namespace hana {
-    template <typename T>
-    struct Traversable::list_mcd : Traversable::traverse_mcd {
-        template <typename A, typename Xs, typename F>
-        static constexpr auto traverse_impl(Xs xs, F f) {
-            auto curried_cons = [](auto x) {
-                return [=](auto xs) { return cons(x, xs); };
-            };
-            return foldr(xs, lift<A>(nil<T>), [=](auto x, auto ys) {
-                return ap(fmap(f(x), curried_cons), ys);
-            });
-        }
-    };
-
-    //! `Traversable` instance for `List` instances.
-    //!
-    //! ### Example
-    //! @snippet example/list/traversable.cpp main
-    template <typename T>
-    struct Traversable::instance<T, when<is_a<List, T>()>>
-        : Traversable::list_mcd<T>
-    { };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_TRAVERSABLE_LIST_MCD_HPP
diff --git a/include/boost/hana/traversable/traverse_mcd.hpp b/include/boost/hana/traversable/traverse_mcd.hpp
deleted file mode 100644
index 12fe9de2b..000000000
--- a/include/boost/hana/traversable/traverse_mcd.hpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*!
-@file
-Defines `boost::hana::Traversable::traverse_mcd`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_TRAVERSABLE_TRAVERSE_MCD_HPP
-#define BOOST_HANA_TRAVERSABLE_TRAVERSE_MCD_HPP
-
-#include <boost/hana/traversable/traversable.hpp>
-
-
-namespace boost { namespace hana {
-    //! Minimal complete definition: `traverse`
-    struct Traversable::traverse_mcd {
-        template <typename A, typename T>
-        static constexpr auto sequence_impl(T traversable)
-        { return traverse<A>(traversable, [](auto x) { return x; }); }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_TRAVERSABLE_TRAVERSE_MCD_HPP
diff --git a/include/boost/hana/tuple.hpp b/include/boost/hana/tuple.hpp
index c03151e3c..b6e85883a 100644
--- a/include/boost/hana/tuple.hpp
+++ b/include/boost/hana/tuple.hpp
@@ -10,21 +10,196 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TUPLE_HPP
 #define BOOST_HANA_TUPLE_HPP
 
-#include <boost/hana/tuple/tuple.hpp>
+#include <boost/hana/fwd/tuple.hpp>
 
-#include <boost/hana/tuple/convert.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/detail/constexpr.hpp>
+#include <boost/hana/detail/std/forward.hpp>
+#include <boost/hana/detail/std/move.hpp>
+#include <boost/hana/detail/variadic/at.hpp>
+#include <boost/hana/detail/variadic/drop_into.hpp>
+#include <boost/hana/detail/variadic/take.hpp>
+#include <boost/hana/enumerable.hpp>
+#include <boost/hana/functional/always.hpp>
+#include <boost/hana/functional/id.hpp>
+#include <boost/hana/functional/on.hpp>
+#include <boost/hana/integral.hpp>
+#include <boost/hana/orderable.hpp>
+#include <boost/hana/range.hpp>
 
-// Instances
-#include <boost/hana/tuple/functor.hpp>
-#include <boost/hana/tuple/applicative.hpp>
-#include <boost/hana/tuple/monad.hpp>
-#include <boost/hana/tuple/traversable.hpp>
+// instances
+#include <boost/hana/foldable.hpp>
+#include <boost/hana/functor.hpp>
+#include <boost/hana/iterable.hpp>
+#include <boost/hana/list.hpp>
 
-#include <boost/hana/tuple/foldable.hpp>
-#include <boost/hana/tuple/iterable.hpp>
-#include <boost/hana/tuple/list.hpp>
-#include <boost/hana/tuple/searchable.hpp>
 
-#include <boost/hana/tuple/comparable.hpp>
+namespace boost { namespace hana {
+    template <>
+    struct Foldable::instance<Tuple> : Foldable::unpack_mcd {
+        template <typename Xs, typename F>
+        static constexpr decltype(auto) unpack_impl(Xs&& xs, F&& f) {
+            return detail::std::forward<Xs>(xs)
+                    .storage(detail::std::forward<F>(f));
+        }
+    };
+
+    template <>
+    struct Functor::instance<Tuple> : Functor::fmap_mcd {
+        template <typename Xs, typename F>
+        static constexpr decltype(auto) fmap_impl(Xs&& xs, F f) {
+            return detail::std::forward<Xs>(xs).storage(
+                [f(detail::std::move(f))](auto&& ...xs) -> decltype(auto) {
+                    return tuple(f(detail::std::forward<decltype(xs)>(xs))...);
+                }
+            );
+        }
+    };
+
+    //! Instance of `Iterable` for `Tuple`s.
+    //!
+    //! `Tuple` is an `Iterable` in the most obvious way. The head of a
+    //! non-empty tuple corresponds to its first element. The tail of a
+    //! non-empty tuple is a tuple containing all the elements in the same
+    //! order, except the head. Finally, a tuple is empty if and only if
+    //! it has no elements in it.
+    //!
+    //! ### Example
+    //! @snippet example/list/iterable.cpp main
+    template <>
+    struct Iterable::instance<Tuple> : Iterable::mcd {
+        template <typename Xs>
+        static constexpr decltype(auto) head_impl(Xs&& xs) {
+            return detail::std::forward<Xs>(xs).storage(
+                [](auto&& x, auto&& ...rest) -> decltype(auto) {
+                    return id(detail::std::forward<decltype(x)>(x));
+                }
+            );
+        }
+
+        template <typename Xs>
+        static constexpr decltype(auto) tail_impl(Xs&& xs) {
+            return detail::std::forward<Xs>(xs).storage(
+                [](auto&& x, auto&& ...rest) -> decltype(auto) {
+                    return tuple(detail::std::forward<decltype(rest)>(rest)...);
+                }
+            );
+        }
+
+        template <typename Xs>
+        static constexpr decltype(auto) is_empty_impl(Xs&& xs) {
+            return detail::std::forward<Xs>(xs).storage(
+                [](auto const& ...xs) -> decltype(auto) {
+                    return bool_<sizeof...(xs) == 0>;
+                }
+            );
+        }
+
+        template <typename Index, typename Xs>
+        static constexpr decltype(auto) at_impl(Index n, Xs&& xs) {
+            return detail::std::forward<Xs>(xs).storage(
+                [n](auto&& ...xs) -> decltype(auto) {
+                    return detail::variadic::at<value(n)>(
+                        detail::std::forward<decltype(xs)>(xs)...
+                    );
+                }
+            );
+        }
+
+        template <typename Index, typename Xs>
+        static constexpr decltype(auto) drop_impl(Index n, Xs&& xs) {
+            auto m = min(n, length(xs));
+            return detail::std::forward<Xs>(xs).storage(
+                detail::variadic::drop_into<value(m)>(tuple)
+            );
+        }
+    };
+
+    //! Instance of `List` for the `Tuple` data type.
+    //!
+    //! @todo
+    //! Use perfect forwarding everywhere possible.
+    template <>
+    struct List::instance<Tuple> : List::mcd<Tuple> {
+        static BOOST_HANA_CONSTEXPR_LAMBDA decltype(auto) nil_impl() {
+            return tuple();
+        }
+
+        template <typename X, typename Xs>
+        static constexpr decltype(auto) cons_impl(X&& x, Xs&& xs) {
+            return detail::std::forward<Xs>(xs).storage(
+                [x(detail::std::forward<X>(x))](auto&& ...xs) -> decltype(auto) {
+                    return tuple(
+                        detail::std::move(x),
+                        detail::std::forward<decltype(xs)>(xs)...
+                    );
+                }
+            );
+        }
+
+        template <typename ...Xs>
+        static constexpr decltype(auto) make_impl(Xs&& ...xs) {
+            return tuple(detail::std::forward<Xs>(xs)...);
+        }
+
+        template <typename Xs, typename Ys>
+        static constexpr decltype(auto) concat_impl(Xs&& xs, Ys&& ys) {
+            return detail::std::forward<Xs>(xs).storage(
+                [ys(detail::std::forward<Ys>(ys))](auto&& ...xs) -> decltype(auto) {
+                    return detail::std::move(ys).storage(
+                        //! @todo Initialize the capture with perfect
+                        //! forwarding once that's supported by the language.
+                        [=](auto&& ...ys) -> decltype(auto) {
+                            return tuple(
+                                detail::std::move(xs)...,
+                                detail::std::forward<decltype(ys)>(ys)...
+                            );
+                        }
+                    );
+                }
+            );
+        }
+
+        template <typename Xs>
+        static constexpr decltype(auto) init_impl(Xs&& xs) {
+            return unpack(range(size_t<0>, pred(length(xs))),
+                on(tuple, [&xs](auto index) -> decltype(auto) {
+                    return at(index, detail::std::forward<Xs>(xs));
+                })
+            );
+        }
+
+        template <typename Xs, typename X>
+        static constexpr decltype(auto) snoc_impl(Xs&& xs, X&& x) {
+            return detail::std::forward<Xs>(xs).storage(
+                [x(detail::std::forward<X>(x))](auto&& ...xs) -> decltype(auto) {
+                    return tuple(
+                        detail::std::forward<decltype(xs)>(xs)...,
+                        detail::std::move(x)
+                    );
+                }
+            );
+        }
+
+        template <typename N, typename Xs>
+        static constexpr decltype(auto) take_impl(N n, Xs&& xs) {
+            auto m = min(n, length(xs));
+            return detail::std::forward<Xs>(xs).storage(
+                detail::variadic::take<value(m)>
+            )(tuple);
+        }
+
+        template <typename F, typename ...Xss>
+        static constexpr auto zip_with_impl(F f, Xss ...tuples) {
+            auto go = [=](auto index, auto ...nothing) {
+                return always(f)(nothing...)(at(index, tuples)...);
+            };
+            auto zip_length = minimum(tuple(length(tuples)...));
+            return unpack(range(size_t<0>, zip_length),
+                on(tuple, go)
+            );
+        }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_TUPLE_HPP
diff --git a/include/boost/hana/tuple/applicative.hpp b/include/boost/hana/tuple/applicative.hpp
deleted file mode 100644
index a65405357..000000000
--- a/include/boost/hana/tuple/applicative.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Applicative` for `boost::hana::Tuple`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_TUPLE_APPLICATIVE_HPP
-#define BOOST_HANA_TUPLE_APPLICATIVE_HPP
-
-#include <boost/hana/tuple/list.hpp>
-#include <boost/hana/tuple/functor.hpp>
-#include <boost/hana/applicative/list_mcd.hpp>
-
-#endif // !BOOST_HANA_TUPLE_APPLICATIVE_HPP
diff --git a/include/boost/hana/tuple/comparable.hpp b/include/boost/hana/tuple/comparable.hpp
deleted file mode 100644
index a25f58e79..000000000
--- a/include/boost/hana/tuple/comparable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Comparable` for `boost::hana::Tuple`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_TUPLE_COMPARABLE_HPP
-#define BOOST_HANA_TUPLE_COMPARABLE_HPP
-
-#include <boost/hana/tuple/list.hpp>
-#include <boost/hana/comparable/list_mcd.hpp>
-
-#endif // !BOOST_HANA_TUPLE_COMPARABLE_HPP
diff --git a/include/boost/hana/tuple/convert.hpp b/include/boost/hana/tuple/convert.hpp
deleted file mode 100644
index a9f033ee8..000000000
--- a/include/boost/hana/tuple/convert.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the conversions to a `boost::hana::Tuple`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_TUPLE_CONVERT_HPP
-#define BOOST_HANA_TUPLE_CONVERT_HPP
-
-#include <boost/hana/tuple/list.hpp>
-#include <boost/hana/list/convert.hpp>
-
-#endif // !BOOST_HANA_TUPLE_CONVERT_HPP
diff --git a/include/boost/hana/tuple/foldable.hpp b/include/boost/hana/tuple/foldable.hpp
deleted file mode 100644
index 0a3666d83..000000000
--- a/include/boost/hana/tuple/foldable.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Foldable` for `boost::hana::Tuple`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_TUPLE_FOLDABLE_HPP
-#define BOOST_HANA_TUPLE_FOLDABLE_HPP
-
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/foldable/unpack_mcd.hpp>
-#include <boost/hana/tuple/tuple.hpp>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct Foldable::instance<Tuple> : Foldable::unpack_mcd {
-        template <typename Xs, typename F>
-        static constexpr decltype(auto) unpack_impl(Xs&& xs, F&& f) {
-            return detail::std::forward<Xs>(xs)
-                    .storage(detail::std::forward<F>(f));
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_TUPLE_FOLDABLE_HPP
diff --git a/include/boost/hana/tuple/functor.hpp b/include/boost/hana/tuple/functor.hpp
deleted file mode 100644
index 96e32e6d4..000000000
--- a/include/boost/hana/tuple/functor.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Functor` for `boost::hana::Tuple`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_TUPLE_FUNCTOR_HPP
-#define BOOST_HANA_TUPLE_FUNCTOR_HPP
-
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/detail/std/move.hpp>
-#include <boost/hana/functor/fmap_mcd.hpp>
-#include <boost/hana/tuple/tuple.hpp>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct Functor::instance<Tuple> : Functor::fmap_mcd {
-        template <typename Xs, typename F>
-        static constexpr decltype(auto) fmap_impl(Xs&& xs, F f) {
-            return detail::std::forward<Xs>(xs).storage(
-                [f(detail::std::move(f))](auto&& ...xs) -> decltype(auto) {
-                    return tuple(f(detail::std::forward<decltype(xs)>(xs))...);
-                }
-            );
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_TUPLE_FUNCTOR_HPP
diff --git a/include/boost/hana/tuple/iterable.hpp b/include/boost/hana/tuple/iterable.hpp
deleted file mode 100644
index 11c9f8c9d..000000000
--- a/include/boost/hana/tuple/iterable.hpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Iterable` for `boost::hana::Tuple`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_TUPLE_ITERABLE_HPP
-#define BOOST_HANA_TUPLE_ITERABLE_HPP
-
-#include <boost/hana/bool.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/detail/variadic/at.hpp>
-#include <boost/hana/detail/variadic/drop_into.hpp>
-#include <boost/hana/functional/id.hpp>
-#include <boost/hana/iterable/mcd.hpp>
-#include <boost/hana/tuple/foldable.hpp>
-#include <boost/hana/tuple/tuple.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Iterable` for `Tuple`s.
-    //!
-    //! `Tuple` is an `Iterable` in the most obvious way. The head of a
-    //! non-empty tuple corresponds to its first element. The tail of a
-    //! non-empty tuple is a tuple containing all the elements in the same
-    //! order, except the head. Finally, a tuple is empty if and only if
-    //! it has no elements in it.
-    //!
-    //! ### Example
-    //! @snippet example/list/iterable.cpp main
-    template <>
-    struct Iterable::instance<Tuple> : Iterable::mcd {
-        template <typename Xs>
-        static constexpr decltype(auto) head_impl(Xs&& xs) {
-            return detail::std::forward<Xs>(xs).storage(
-                [](auto&& x, auto&& ...rest) -> decltype(auto) {
-                    return id(detail::std::forward<decltype(x)>(x));
-                }
-            );
-        }
-
-        template <typename Xs>
-        static constexpr decltype(auto) tail_impl(Xs&& xs) {
-            return detail::std::forward<Xs>(xs).storage(
-                [](auto&& x, auto&& ...rest) -> decltype(auto) {
-                    return tuple(detail::std::forward<decltype(rest)>(rest)...);
-                }
-            );
-        }
-
-        template <typename Xs>
-        static constexpr decltype(auto) is_empty_impl(Xs&& xs) {
-            return detail::std::forward<Xs>(xs).storage(
-                [](auto const& ...xs) -> decltype(auto) {
-                    return bool_<sizeof...(xs) == 0>;
-                }
-            );
-        }
-
-        template <typename Index, typename Xs>
-        static constexpr decltype(auto) at_impl(Index n, Xs&& xs) {
-            return detail::std::forward<Xs>(xs).storage(
-                [n](auto&& ...xs) -> decltype(auto) {
-                    return detail::variadic::at<value(n)>(
-                        detail::std::forward<decltype(xs)>(xs)...
-                    );
-                }
-            );
-        }
-
-        template <typename Index, typename Xs>
-        static constexpr decltype(auto) drop_impl(Index n, Xs&& xs) {
-            auto m = min(n, length(xs));
-            return detail::std::forward<Xs>(xs).storage(
-                detail::variadic::drop_into<value(m)>(tuple)
-            );
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_TUPLE_ITERABLE_HPP
diff --git a/include/boost/hana/tuple/list.hpp b/include/boost/hana/tuple/list.hpp
deleted file mode 100644
index fd25c4e87..000000000
--- a/include/boost/hana/tuple/list.hpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::List` for `boost::hana::Tuple`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_TUPLE_LIST_HPP
-#define BOOST_HANA_TUPLE_LIST_HPP
-
-#include <boost/hana/detail/constexpr.hpp>
-#include <boost/hana/detail/std/forward.hpp>
-#include <boost/hana/detail/std/move.hpp>
-#include <boost/hana/detail/variadic/take.hpp>
-#include <boost/hana/foldable/foldable.hpp>
-#include <boost/hana/functional/always.hpp>
-#include <boost/hana/functional/on.hpp>
-#include <boost/hana/group/group.hpp>
-#include <boost/hana/integral.hpp>
-#include <boost/hana/iterable/iterable.hpp>
-#include <boost/hana/list/mcd.hpp>
-#include <boost/hana/orderable/orderable.hpp>
-#include <boost/hana/range.hpp>
-#include <boost/hana/tuple/tuple.hpp>
-
-// Mcd
-#include <boost/hana/tuple/monad.hpp>
-#include <boost/hana/tuple/foldable.hpp>
-#include <boost/hana/tuple/iterable.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `List` for the `Tuple` data type.
-    //!
-    //! @todo
-    //! Use perfect forwarding everywhere possible.
-    template <>
-    struct List::instance<Tuple> : List::mcd<Tuple> {
-        static BOOST_HANA_CONSTEXPR_LAMBDA decltype(auto) nil_impl() {
-            return tuple();
-        }
-
-        template <typename X, typename Xs>
-        static constexpr decltype(auto) cons_impl(X&& x, Xs&& xs) {
-            return detail::std::forward<Xs>(xs).storage(
-                [x(detail::std::forward<X>(x))](auto&& ...xs) -> decltype(auto) {
-                    return tuple(
-                        detail::std::move(x),
-                        detail::std::forward<decltype(xs)>(xs)...
-                    );
-                }
-            );
-        }
-
-        template <typename ...Xs>
-        static constexpr decltype(auto) make_impl(Xs&& ...xs) {
-            return tuple(detail::std::forward<Xs>(xs)...);
-        }
-
-        template <typename Xs, typename Ys>
-        static constexpr decltype(auto) concat_impl(Xs&& xs, Ys&& ys) {
-            return detail::std::forward<Xs>(xs).storage(
-                [ys(detail::std::forward<Ys>(ys))](auto&& ...xs) -> decltype(auto) {
-                    return detail::std::move(ys).storage(
-                        //! @todo Initialize the capture with perfect
-                        //! forwarding once that's supported by the language.
-                        [=](auto&& ...ys) -> decltype(auto) {
-                            return tuple(
-                                detail::std::move(xs)...,
-                                detail::std::forward<decltype(ys)>(ys)...
-                            );
-                        }
-                    );
-                }
-            );
-        }
-
-        template <typename Xs>
-        static constexpr decltype(auto) init_impl(Xs&& xs) {
-            return unpack(range(size_t<0>, minus(length(xs), size_t<1>)),
-                on(tuple, [&xs](auto index) -> decltype(auto) {
-                    return at(index, detail::std::forward<Xs>(xs));
-                })
-            );
-        }
-
-        template <typename Xs, typename X>
-        static constexpr decltype(auto) snoc_impl(Xs&& xs, X&& x) {
-            return detail::std::forward<Xs>(xs).storage(
-                [x(detail::std::forward<X>(x))](auto&& ...xs) -> decltype(auto) {
-                    return tuple(
-                        detail::std::forward<decltype(xs)>(xs)...,
-                        detail::std::move(x)
-                    );
-                }
-            );
-        }
-
-        template <typename N, typename Xs>
-        static constexpr decltype(auto) take_impl(N n, Xs&& xs) {
-            auto m = min(n, length(xs));
-            return detail::std::forward<Xs>(xs).storage(
-                detail::variadic::take<value(m)>
-            )(tuple);
-        }
-
-        template <typename F, typename ...Xss>
-        static constexpr auto zip_with_impl(F f, Xss ...tuples) {
-            auto go = [=](auto index, auto ...nothing) {
-                return always(f)(nothing...)(at(index, tuples)...);
-            };
-            auto zip_length = minimum(tuple(length(tuples)...));
-            return unpack(range(size_t<0>, zip_length),
-                on(tuple, go)
-            );
-        }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_TUPLE_LIST_HPP
diff --git a/include/boost/hana/tuple/monad.hpp b/include/boost/hana/tuple/monad.hpp
deleted file mode 100644
index da14d8a0d..000000000
--- a/include/boost/hana/tuple/monad.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Monad` for `boost::hana::Tuple`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_TUPLE_MONAD_HPP
-#define BOOST_HANA_TUPLE_MONAD_HPP
-
-#include <boost/hana/tuple/list.hpp>
-#include <boost/hana/tuple/applicative.hpp>
-#include <boost/hana/monad/list_mcd.hpp>
-
-#endif // !BOOST_HANA_TUPLE_MONAD_HPP
diff --git a/include/boost/hana/tuple/searchable.hpp b/include/boost/hana/tuple/searchable.hpp
deleted file mode 100644
index 91b552c02..000000000
--- a/include/boost/hana/tuple/searchable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Searchable` for `boost::hana::Tuple`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_TUPLE_SEARCHABLE_HPP
-#define BOOST_HANA_TUPLE_SEARCHABLE_HPP
-
-#include <boost/hana/tuple/list.hpp>
-#include <boost/hana/searchable/list_mcd.hpp>
-
-#endif // !BOOST_HANA_TUPLE_SEARCHABLE_HPP
diff --git a/include/boost/hana/tuple/traversable.hpp b/include/boost/hana/tuple/traversable.hpp
deleted file mode 100644
index af0238929..000000000
--- a/include/boost/hana/tuple/traversable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Traversable` for `boost::hana::Tuple`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_TUPLE_TRAVERSABLE_HPP
-#define BOOST_HANA_TUPLE_TRAVERSABLE_HPP
-
-#include <boost/hana/tuple/list.hpp>
-#include <boost/hana/traversable/list_mcd.hpp>
-
-#endif // !BOOST_HANA_TUPLE_TRAVERSABLE_HPP
diff --git a/include/boost/hana/type.hpp b/include/boost/hana/type.hpp
index 46a276cf4..670fc9e88 100644
--- a/include/boost/hana/type.hpp
+++ b/include/boost/hana/type.hpp
@@ -10,10 +10,38 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TYPE_HPP
 #define BOOST_HANA_TYPE_HPP
 
-#include <boost/hana/type/type.hpp>
-#include <boost/hana/type/sizeof.hpp>
+#include <boost/hana/fwd/type.hpp>
 
-// Instances
-#include <boost/hana/type/comparable.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/integral.hpp>
+
+// instances
+#include <boost/hana/comparable.hpp>
+
+
+namespace boost { namespace hana {
+    //! Instance of `Comparable` for `Type`s.
+    //!
+    //! Two `Type`s are equal if and only if they represent the same C++ type.
+    //! Hence, equality is equivalent to the `std::is_same` type trait.
+    //!
+    //! @snippet example/type/comparable.cpp main
+    template <>
+    struct Comparable::instance<Type, Type> : Comparable::equal_mcd {
+        template <typename T, typename U>
+        static constexpr auto equal_impl(T, U)
+        { return false_; }
+
+        template <typename T>
+        static constexpr auto equal_impl(T, T)
+        { return true_; }
+    };
+
+    namespace type_detail {
+        template <typename T>
+        constexpr auto sizeof_::operator()(T) const
+        { return size_t<sizeof(typename T::type)>; }
+    }
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_TYPE_HPP
diff --git a/include/boost/hana/type/comparable.hpp b/include/boost/hana/type/comparable.hpp
deleted file mode 100644
index 6089c0741..000000000
--- a/include/boost/hana/type/comparable.hpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Comparable` for `boost::hana::Type`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_TYPE_COMPARABLE_HPP
-#define BOOST_HANA_TYPE_COMPARABLE_HPP
-
-#include <boost/hana/bool.hpp>
-#include <boost/hana/comparable/equal_mcd.hpp>
-#include <boost/hana/type/type.hpp>
-
-
-namespace boost { namespace hana {
-    //! Instance of `Comparable` for `Type`s.
-    //!
-    //! Two `Type`s are equal if and only if they represent the same C++ type.
-    //! Hence, equality is equivalent to the `std::is_same` type trait.
-    //!
-    //! @snippet example/type/comparable.cpp main
-    template <>
-    struct Comparable::instance<Type, Type> : Comparable::equal_mcd {
-        template <typename T, typename U>
-        static constexpr auto equal_impl(T, U)
-        { return false_; }
-
-        template <typename T>
-        static constexpr auto equal_impl(T, T)
-        { return true_; }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_TYPE_COMPARABLE_HPP
diff --git a/include/boost/hana/type/sizeof.hpp b/include/boost/hana/type/sizeof.hpp
deleted file mode 100644
index 0a1e39840..000000000
--- a/include/boost/hana/type/sizeof.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*!
-@file
-Defines `boost::hana::sizeof_`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_TYPE_SIZEOF_HPP
-#define BOOST_HANA_TYPE_SIZEOF_HPP
-
-#include <boost/hana/integral.hpp>
-#include <boost/hana/type/type.hpp>
-
-
-namespace boost { namespace hana { namespace type_detail {
-    template <typename T>
-    constexpr auto sizeof_::operator()(T) const
-    { return size_t<sizeof(typename T::type)>; }
-}}}
-
-#endif // !BOOST_HANA_TYPE_SIZEOF_HPP
diff --git a/include/boost/hana/type_list.hpp b/include/boost/hana/type_list.hpp
index 522b034cb..5ffc5eed4 100644
--- a/include/boost/hana/type_list.hpp
+++ b/include/boost/hana/type_list.hpp
@@ -10,20 +10,84 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TYPE_LIST_HPP
 #define BOOST_HANA_TYPE_LIST_HPP
 
-#include <boost/hana/type_list/type_list.hpp>
-#include <boost/hana/type_list/convert.hpp>
+#include <boost/hana/fwd/type_list.hpp>
 
-// Instances
-#include <boost/hana/type_list/functor.hpp>
-#include <boost/hana/type_list/applicative.hpp>
-#include <boost/hana/type_list/monad.hpp>
-#include <boost/hana/type_list/traversable.hpp>
+#include <boost/hana/bool.hpp>
+#include <boost/hana/type.hpp>
 
-#include <boost/hana/type_list/foldable.hpp>
-#include <boost/hana/type_list/iterable.hpp>
-#include <boost/hana/type_list/list.hpp>
-#include <boost/hana/type_list/searchable.hpp>
+// instances
+#include <boost/hana/comparable.hpp>
+#include <boost/hana/foldable.hpp>
+#include <boost/hana/iterable.hpp>
+#include <boost/hana/list.hpp>
 
-#include <boost/hana/type_list/comparable.hpp>
+
+namespace boost { namespace hana {
+    template <>
+    struct Comparable::instance<TypeList, TypeList> : Comparable::equal_mcd {
+        template <typename Xs, typename Ys>
+        static constexpr auto equal_impl(Xs, Ys)
+        { return false_; }
+
+        template <typename Xs>
+        static constexpr auto equal_impl(Xs, Xs)
+        { return true_; }
+    };
+
+    template <>
+    struct Foldable::instance<TypeList> : Foldable::unpack_mcd {
+        //! @todo Fix the lost optimization caused by unpacking with `Type`s.
+        template <typename ...Xs, typename F>
+        static constexpr auto unpack_impl(detail::repr::type_list<Xs...>, F f)
+        { return f(type<Xs>...); }
+
+        template <typename Xs, typename F>
+        static constexpr auto unpack_impl(Xs, F f)
+        { return unpack_impl(typename Xs::storage{}, f); }
+    };
+
+    template <>
+    struct Iterable::instance<TypeList> : Iterable::mcd {
+        template <typename Xs>
+        static constexpr auto head_impl(Xs)
+        { return head_impl(typename Xs::storage{}); }
+
+        template <typename X, typename ...Xs>
+        static constexpr auto head_impl(detail::repr::type_list<X, Xs...>)
+        { return type<X>; }
+
+
+        template <typename Xs>
+        static constexpr auto tail_impl(Xs)
+        { return tail_impl(typename Xs::storage{}); }
+
+        template <typename X, typename ...Xs>
+        static constexpr auto tail_impl(detail::repr::type_list<X, Xs...>)
+        { return type_list<Xs...>; }
+
+
+        template <typename Xs>
+        static constexpr auto is_empty_impl(Xs)
+        { return is_empty_impl(typename Xs::storage{}); }
+
+        template <typename ...Xs>
+        static constexpr auto is_empty_impl(detail::repr::type_list<Xs...>)
+        { return bool_<sizeof...(Xs) == 0>; }
+    };
+
+    template <>
+    struct List::instance<TypeList> : List::mcd<TypeList> {
+        template <typename X, typename ...Xs>
+        static constexpr auto cons_impl(X, detail::repr::type_list<Xs...>)
+        { return type_list<typename X::type, Xs...>; }
+
+        template <typename X, typename Xs>
+        static constexpr auto cons_impl(X x, Xs xs)
+        { return cons_impl(x, typename Xs::storage{}); }
+
+        static constexpr auto nil_impl()
+        { return type_list<>; }
+    };
+}} // end namespace boost::hana
 
 #endif // !BOOST_HANA_TYPE_LIST_HPP
diff --git a/include/boost/hana/type_list/applicative.hpp b/include/boost/hana/type_list/applicative.hpp
deleted file mode 100644
index aa7327bd2..000000000
--- a/include/boost/hana/type_list/applicative.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Applicative` for `boost::hana::TypeList`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_TYPE_LIST_APPLICATIVE_HPP
-#define BOOST_HANA_TYPE_LIST_APPLICATIVE_HPP
-
-#include <boost/hana/type_list/list.hpp>
-#include <boost/hana/type_list/functor.hpp>
-#include <boost/hana/applicative/list_mcd.hpp>
-
-#endif // !BOOST_HANA_TYPE_LIST_APPLICATIVE_HPP
diff --git a/include/boost/hana/type_list/comparable.hpp b/include/boost/hana/type_list/comparable.hpp
deleted file mode 100644
index 379435f4c..000000000
--- a/include/boost/hana/type_list/comparable.hpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Comparable` for `boost::hana::TypeList`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_TYPE_LIST_COMPARABLE_HPP
-#define BOOST_HANA_TYPE_LIST_COMPARABLE_HPP
-
-#include <boost/hana/bool.hpp>
-#include <boost/hana/comparable/equal_mcd.hpp>
-#include <boost/hana/type_list/type_list.hpp>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct Comparable::instance<TypeList, TypeList> : Comparable::equal_mcd {
-        template <typename Xs, typename Ys>
-        static constexpr auto equal_impl(Xs, Ys)
-        { return false_; }
-
-        template <typename Xs>
-        static constexpr auto equal_impl(Xs, Xs)
-        { return true_; }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_TYPE_LIST_COMPARABLE_HPP
diff --git a/include/boost/hana/type_list/convert.hpp b/include/boost/hana/type_list/convert.hpp
deleted file mode 100644
index dabcd9c73..000000000
--- a/include/boost/hana/type_list/convert.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the conversions to a `boost::hana::TypeList`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_TYPE_LIST_CONVERT_HPP
-#define BOOST_HANA_TYPE_LIST_CONVERT_HPP
-
-#include <boost/hana/type_list/list.hpp>
-#include <boost/hana/list/convert.hpp>
-
-#endif // !BOOST_HANA_TYPE_LIST_CONVERT_HPP
diff --git a/include/boost/hana/type_list/foldable.hpp b/include/boost/hana/type_list/foldable.hpp
deleted file mode 100644
index 0a9b6010d..000000000
--- a/include/boost/hana/type_list/foldable.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Foldable` for `boost::hana::TypeList`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_TYPE_LIST_FOLDABLE_HPP
-#define BOOST_HANA_TYPE_LIST_FOLDABLE_HPP
-
-#include <boost/hana/foldable/unpack_mcd.hpp>
-#include <boost/hana/type.hpp>
-#include <boost/hana/type_list/type_list.hpp>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct Foldable::instance<TypeList> : Foldable::unpack_mcd {
-        //! @todo Fix the lost optimization caused by unpacking with `Type`s.
-        template <typename ...Xs, typename F>
-        static constexpr auto unpack_impl(detail::repr::type_list<Xs...>, F f)
-        { return f(type<Xs>...); }
-
-        template <typename Xs, typename F>
-        static constexpr auto unpack_impl(Xs, F f)
-        { return unpack_impl(typename Xs::storage{}, f); }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_TYPE_LIST_FOLDABLE_HPP
diff --git a/include/boost/hana/type_list/functor.hpp b/include/boost/hana/type_list/functor.hpp
deleted file mode 100644
index 9d8a94187..000000000
--- a/include/boost/hana/type_list/functor.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Functor` for `boost::hana::TypeList`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_TYPE_LIST_FUNCTOR_HPP
-#define BOOST_HANA_TYPE_LIST_FUNCTOR_HPP
-
-#include <boost/hana/type_list/list.hpp>
-#include <boost/hana/functor/list_mcd.hpp>
-
-#endif // !BOOST_HANA_TYPE_LIST_FUNCTOR_HPP
diff --git a/include/boost/hana/type_list/iterable.hpp b/include/boost/hana/type_list/iterable.hpp
deleted file mode 100644
index 07c7cd6fa..000000000
--- a/include/boost/hana/type_list/iterable.hpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Iterable` for `boost::hana::TypeList`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_TYPE_LIST_ITERABLE_HPP
-#define BOOST_HANA_TYPE_LIST_ITERABLE_HPP
-
-#include <boost/hana/bool.hpp>
-#include <boost/hana/iterable/mcd.hpp>
-#include <boost/hana/type.hpp>
-#include <boost/hana/type_list/type_list.hpp>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct Iterable::instance<TypeList> : Iterable::mcd {
-        template <typename Xs>
-        static constexpr auto head_impl(Xs)
-        { return head_impl(typename Xs::storage{}); }
-
-        template <typename X, typename ...Xs>
-        static constexpr auto head_impl(detail::repr::type_list<X, Xs...>)
-        { return type<X>; }
-
-
-        template <typename Xs>
-        static constexpr auto tail_impl(Xs)
-        { return tail_impl(typename Xs::storage{}); }
-
-        template <typename X, typename ...Xs>
-        static constexpr auto tail_impl(detail::repr::type_list<X, Xs...>)
-        { return type_list<Xs...>; }
-
-
-        template <typename Xs>
-        static constexpr auto is_empty_impl(Xs)
-        { return is_empty_impl(typename Xs::storage{}); }
-
-        template <typename ...Xs>
-        static constexpr auto is_empty_impl(detail::repr::type_list<Xs...>)
-        { return bool_<sizeof...(Xs) == 0>; }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_TYPE_LIST_ITERABLE_HPP
diff --git a/include/boost/hana/type_list/list.hpp b/include/boost/hana/type_list/list.hpp
deleted file mode 100644
index 833f64633..000000000
--- a/include/boost/hana/type_list/list.hpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::List` for `boost::hana::TypeList`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_TYPE_LIST_LIST_HPP
-#define BOOST_HANA_TYPE_LIST_LIST_HPP
-
-#include <boost/hana/list/mcd.hpp>
-#include <boost/hana/type_list/type_list.hpp>
-
-// Mcd
-#include <boost/hana/type_list/monad.hpp>
-#include <boost/hana/type_list/foldable.hpp>
-#include <boost/hana/type_list/iterable.hpp>
-
-
-namespace boost { namespace hana {
-    template <>
-    struct List::instance<TypeList> : List::mcd<TypeList> {
-        template <typename X, typename ...Xs>
-        static constexpr auto cons_impl(X, detail::repr::type_list<Xs...>)
-        { return type_list<typename X::type, Xs...>; }
-
-        template <typename X, typename Xs>
-        static constexpr auto cons_impl(X x, Xs xs)
-        { return cons_impl(x, typename Xs::storage{}); }
-
-        static constexpr auto nil_impl()
-        { return type_list<>; }
-    };
-}} // end namespace boost::hana
-
-#endif // !BOOST_HANA_TYPE_LIST_LIST_HPP
diff --git a/include/boost/hana/type_list/monad.hpp b/include/boost/hana/type_list/monad.hpp
deleted file mode 100644
index 232feb6cc..000000000
--- a/include/boost/hana/type_list/monad.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Monad` for `boost::hana::TypeList`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_TYPE_LIST_MONAD_HPP
-#define BOOST_HANA_TYPE_LIST_MONAD_HPP
-
-#include <boost/hana/type_list/list.hpp>
-#include <boost/hana/type_list/applicative.hpp>
-#include <boost/hana/monad/list_mcd.hpp>
-
-#endif // !BOOST_HANA_TYPE_LIST_MONAD_HPP
diff --git a/include/boost/hana/type_list/searchable.hpp b/include/boost/hana/type_list/searchable.hpp
deleted file mode 100644
index 921bdee9c..000000000
--- a/include/boost/hana/type_list/searchable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Searchable` for `boost::hana::TypeList`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_TYPE_LIST_SEARCHABLE_HPP
-#define BOOST_HANA_TYPE_LIST_SEARCHABLE_HPP
-
-#include <boost/hana/type_list/list.hpp>
-#include <boost/hana/searchable/list_mcd.hpp>
-
-#endif // !BOOST_HANA_TYPE_LIST_SEARCHABLE_HPP
diff --git a/include/boost/hana/type_list/traversable.hpp b/include/boost/hana/type_list/traversable.hpp
deleted file mode 100644
index 811b23627..000000000
--- a/include/boost/hana/type_list/traversable.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
-@file
-Defines the instance of `boost::hana::Traversable` for `boost::hana::TypeList`.
-
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#ifndef BOOST_HANA_TYPE_LIST_TRAVERSABLE_HPP
-#define BOOST_HANA_TYPE_LIST_TRAVERSABLE_HPP
-
-#include <boost/hana/type_list/list.hpp>
-#include <boost/hana/traversable/list_mcd.hpp>
-
-#endif // !BOOST_HANA_TYPE_LIST_TRAVERSABLE_HPP
diff --git a/test/bool/comparable.cpp b/test/bool/comparable.cpp
index 8ff2ba5f7..5e64bcac3 100644
--- a/test/bool/comparable.cpp
+++ b/test/bool/comparable.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/bool/comparable.hpp>
+#include <boost/hana/bool.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
diff --git a/test/bool/constant.cpp b/test/bool/constant.cpp
index 9790c0484..42fd83943 100644
--- a/test/bool/constant.cpp
+++ b/test/bool/constant.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/bool/constant.hpp>
+#include <boost/hana/bool.hpp>
 
 #include <test/laws/constant.hpp>
 using namespace boost::hana;
diff --git a/test/bool/logical.cpp b/test/bool/logical.cpp
index a28120a9a..39a08d817 100644
--- a/test/bool/logical.cpp
+++ b/test/bool/logical.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/bool/comparable.hpp>
-#include <boost/hana/bool/logical.hpp>
+#include <boost/hana/bool.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
diff --git a/test/comparable/list_mcd.cpp b/test/comparable/list_mcd.cpp
index 023eac564..8c00a88bd 100644
--- a/test/comparable/list_mcd.cpp
+++ b/test/comparable/list_mcd.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/list/mcd.hpp>
+#include <boost/hana/list.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
diff --git a/test/comparable/mcds.hpp b/test/comparable/mcds.hpp
index 6e3a66267..d5e154609 100644
--- a/test/comparable/mcds.hpp
+++ b/test/comparable/mcds.hpp
@@ -4,11 +4,11 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/comparable/operators.hpp>
 #include <boost/hana/core/operators.hpp>
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
 #include <boost/hana/foreign.hpp> //! @todo Find a way to remove this
+#include <boost/hana/fwd/comparable.hpp>
 
 #include <test/injection.hpp>
 #include <test/laws/comparable.hpp>
diff --git a/test/comparable/product_mcd.cpp b/test/comparable/product_mcd.cpp
index 8fc83b162..9d74e0f6a 100644
--- a/test/comparable/product_mcd.cpp
+++ b/test/comparable/product_mcd.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/product/mcd.hpp>
+#include <boost/hana/product.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
diff --git a/test/comparable/record_mcd.cpp b/test/comparable/record_mcd.cpp
index 921eed4b1..e682d40aa 100644
--- a/test/comparable/record_mcd.cpp
+++ b/test/comparable/record_mcd.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/record/mcd.hpp>
+#include <boost/hana/record.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
diff --git a/test/core/is_a.cpp b/test/core/is_a.cpp
index c433904f9..d5fbfced4 100644
--- a/test/core/is_a.cpp
+++ b/test/core/is_a.cpp
@@ -8,12 +8,12 @@ Distributed under the Boost Software License, Version 1.0.
 #include <boost/hana/core/typeclass.hpp>
 
 #include <boost/hana/detail/assert.hpp>
-#include <boost/hana/foldable/foldable.hpp>
+#include <boost/hana/foldable.hpp>
 #include <boost/hana/foreign.hpp>
-#include <boost/hana/iterable/iterable.hpp>
+#include <boost/hana/iterable.hpp>
 #include <boost/hana/maybe.hpp>
-#include <boost/hana/monad/monad.hpp>
-#include <boost/hana/orderable/orderable.hpp>
+#include <boost/hana/monad.hpp>
+#include <boost/hana/orderable.hpp>
 #include <boost/hana/tuple.hpp>
 
 #include <type_traits>
diff --git a/test/either/applicative.cpp b/test/either/applicative.cpp
index 254787d48..5dcd81ce0 100644
--- a/test/either/applicative.cpp
+++ b/test/either/applicative.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/either/applicative.hpp>
-#include <boost/hana/either/comparable.hpp>
+#include <boost/hana/either.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
diff --git a/test/either/comparable.cpp b/test/either/comparable.cpp
index c5b034d6c..bc4fd4682 100644
--- a/test/either/comparable.cpp
+++ b/test/either/comparable.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/either/comparable.hpp>
+#include <boost/hana/either.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
diff --git a/test/either/functor.cpp b/test/either/functor.cpp
index 86dcf02c9..d992b0d6a 100644
--- a/test/either/functor.cpp
+++ b/test/either/functor.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/either/comparable.hpp>
-#include <boost/hana/either/functor.hpp>
+#include <boost/hana/either.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
diff --git a/test/either/monad.cpp b/test/either/monad.cpp
index 4c2bb0d94..48344798b 100644
--- a/test/either/monad.cpp
+++ b/test/either/monad.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/either/comparable.hpp>
-#include <boost/hana/either/monad.hpp>
+#include <boost/hana/either.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
diff --git a/test/ext/boost/fusion/fusion.cpp b/test/ext/boost/fusion/fusion.cpp
new file mode 100644
index 000000000..28ef4a5cd
--- /dev/null
+++ b/test/ext/boost/fusion/fusion.cpp
@@ -0,0 +1,10 @@
+/*
+@copyright Louis Dionne 2014
+Distributed under the Boost Software License, Version 1.0.
+(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+ */
+
+#include <boost/hana/ext/boost/fusion.hpp>
+
+
+int main() { }
diff --git a/test/ext/boost/fusion/sequence/datatype.cpp b/test/ext/boost/fusion/sequence/datatype.cpp
index 18c35a473..f470923a4 100644
--- a/test/ext/boost/fusion/sequence/datatype.cpp
+++ b/test/ext/boost/fusion/sequence/datatype.cpp
@@ -18,28 +18,28 @@ template <bool should>
 auto test = [](auto container) {
     static_assert(std::is_same<
         datatype_t<decltype(container())>,
-        BoostFusionSequence
+        ext::boost::fusion::sequence
     >::value == should, "");
 
     static_assert(std::is_same<
         datatype_t<decltype(container(1))>,
-        BoostFusionSequence
+        ext::boost::fusion::sequence
     >::value == should, "");
 
     static_assert(std::is_same<
         datatype_t<decltype(container(1, '2'))>,
-        BoostFusionSequence
+        ext::boost::fusion::sequence
     >::value == should, "");
 
     static_assert(std::is_same<
         datatype_t<decltype(container(1, '2', 3.3))>,
-        BoostFusionSequence
+        ext::boost::fusion::sequence
     >::value == should, "");
 };
 
 int main() {
     with_nonassociative_forward_sequences(test<true>);
-    test<false>([](auto ...xs) { return boost::fusion::make_set(xs...); });
+    test<false>([](auto ...xs) { return ::boost::fusion::make_set(xs...); });
     test<false>([](auto ...xs) { return int{1}; });
     test<false>([](auto ...xs) { return; });
 }
diff --git a/test/ext/boost/fusion/sequence/helper.hpp b/test/ext/boost/fusion/sequence/helper.hpp
index cfb3b96d4..4f38916cc 100644
--- a/test/ext/boost/fusion/sequence/helper.hpp
+++ b/test/ext/boost/fusion/sequence/helper.hpp
@@ -4,8 +4,8 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#ifndef BOOST_HANA_TEST_EXT_BOOST_FUSION_HELPER_HPP
-#define BOOST_HANA_TEST_EXT_BOOST_FUSION_HELPER_HPP
+#ifndef BOOST_HANA_TEST_EXT_FUSION_HELPER_HPP
+#define BOOST_HANA_TEST_EXT_FUSION_HELPER_HPP
 
 #include <boost/hana/tuple.hpp>
 
@@ -36,4 +36,4 @@ auto with_nonassociative_forward_sequences = [](auto test) {
 #endif
 };
 
-#endif // !BOOST_HANA_TEST_EXT_BOOST_FUSION_HELPER_HPP
+#endif // !BOOST_HANA_TEST_EXT_FUSION_HELPER_HPP
diff --git a/test/ext/boost/fusion/sequence/iterable.cpp b/test/ext/boost/fusion/sequence/iterable.cpp
index 2ec9e7252..322f6a06c 100644
--- a/test/ext/boost/fusion/sequence/iterable.cpp
+++ b/test/ext/boost/fusion/sequence/iterable.cpp
@@ -9,7 +9,7 @@ Distributed under the Boost Software License, Version 1.0.
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/foreign.hpp>
 #include <boost/hana/integral.hpp>
-#include <boost/hana/logical/logical.hpp>
+#include <boost/hana/logical.hpp>
 
 #include "helper.hpp"
 using namespace boost::hana;
diff --git a/test/ext/boost/fusion/sequence/list.cpp b/test/ext/boost/fusion/sequence/list.cpp
index 9b33e96bb..e62e5fb90 100644
--- a/test/ext/boost/fusion/sequence/list.cpp
+++ b/test/ext/boost/fusion/sequence/list.cpp
@@ -40,7 +40,7 @@ int main() {
 
         // nil
         {
-            BOOST_HANA_CONSTANT_ASSERT(equal(nil<BoostFusionSequence>, container()));
+            BOOST_HANA_CONSTANT_ASSERT(equal(nil<ext::boost::fusion::sequence>, container()));
         }
 
         // reverse
diff --git a/test/ext/boost/mpl/integral_c/constant.cpp b/test/ext/boost/mpl/integral_c/constant.cpp
index 8a2314aa2..79ada7e23 100644
--- a/test/ext/boost/mpl/integral_c/constant.cpp
+++ b/test/ext/boost/mpl/integral_c/constant.cpp
@@ -9,24 +9,23 @@ Distributed under the Boost Software License, Version 1.0.
 #include <boost/mpl/integral_c.hpp>
 #include <test/laws/constant.hpp>
 using namespace boost::hana;
-namespace mpl = boost::mpl;
 
 
 template <typename T>
 void tests() {
     // value
     {
-        static_assert(value(mpl::integral_c<T, 0>{}) == 0, "");
-        static_assert(value(mpl::integral_c<T, 1>{}) == 1, "");
+        static_assert(value(::boost::mpl::integral_c<T, 0>{}) == 0, "");
+        static_assert(value(::boost::mpl::integral_c<T, 1>{}) == 1, "");
     }
 
     // laws
     {
         Constant_laws(
-            mpl::integral_c<T, 0>{},
-            mpl::integral_c<T, 1>{},
-            mpl::integral_c<T, 2>{},
-            mpl::integral_c<T, 3>{}
+            ::boost::mpl::integral_c<T, 0>{},
+            ::boost::mpl::integral_c<T, 1>{},
+            ::boost::mpl::integral_c<T, 2>{},
+            ::boost::mpl::integral_c<T, 3>{}
         );
     }
 }
diff --git a/test/ext/boost/mpl/integral_c/datatype.cpp b/test/ext/boost/mpl/integral_c/datatype.cpp
index 529a66aeb..ae13b2046 100644
--- a/test/ext/boost/mpl/integral_c/datatype.cpp
+++ b/test/ext/boost/mpl/integral_c/datatype.cpp
@@ -19,33 +19,33 @@ using namespace boost::hana;
 
 
 static_assert(std::is_same<
-    datatype_t<boost::mpl::bool_<true>>,
-    BoostMplIntegralConstant
+    datatype_t< ::boost::mpl::bool_<true>>,
+    ext::boost::mpl::IntegralC
 >::value, "");
 
 static_assert(std::is_same<
-    datatype_t<boost::mpl::int_<0>>,
-    BoostMplIntegralConstant
+    datatype_t< ::boost::mpl::int_<0>>,
+    ext::boost::mpl::IntegralC
 >::value, "");
 
 static_assert(std::is_same<
-    datatype_t<boost::mpl::long_<0>>,
-    BoostMplIntegralConstant
+    datatype_t< ::boost::mpl::long_<0>>,
+    ext::boost::mpl::IntegralC
 >::value, "");
 
 static_assert(std::is_same<
-    datatype_t<boost::mpl::size_t<0>>,
-    BoostMplIntegralConstant
+    datatype_t< ::boost::mpl::size_t<0>>,
+    ext::boost::mpl::IntegralC
 >::value, "");
 
 static_assert(std::is_same<
-    datatype_t<boost::mpl::integral_c<int, 0>>,
-    BoostMplIntegralConstant
+    datatype_t< ::boost::mpl::integral_c<int, 0>>,
+    ext::boost::mpl::IntegralC
 >::value, "");
 
 static_assert(std::is_same<
-    datatype_t<boost::mpl::char_<0>>,
-    BoostMplIntegralConstant
+    datatype_t< ::boost::mpl::char_<0>>,
+    ext::boost::mpl::IntegralC
 >::value, "");
 
 int main() { }
diff --git a/test/ext/boost/mpl/integral_c/integral_constant.cpp b/test/ext/boost/mpl/integral_c/integral_constant.cpp
index 315a4af5d..51f72e20a 100644
--- a/test/ext/boost/mpl/integral_c/integral_constant.cpp
+++ b/test/ext/boost/mpl/integral_c/integral_constant.cpp
@@ -6,25 +6,10 @@ Distributed under the Boost Software License, Version 1.0.
 
 #include <boost/hana/ext/boost/mpl/integral_c.hpp>
 
-#include <test/iso/integral_constant/comparable.hpp>
-#include <test/iso/integral_constant/enumerable.hpp>
-#include <test/iso/integral_constant/group.hpp>
-#include <test/iso/integral_constant/integral_domain.hpp>
-#include <test/iso/integral_constant/logical.hpp>
-#include <test/iso/integral_constant/monoid.hpp>
-#include <test/iso/integral_constant/orderable.hpp>
-#include <test/iso/integral_constant/ring.hpp>
+#include <test/iso/integral_constant.hpp>
 using namespace boost::hana;
 
 
 int main() {
-    IntegralConstant_comparable<BoostMplIntegralConstant, int, int>();
-    IntegralConstant_orderable<BoostMplIntegralConstant, int, int>();
-    IntegralConstant_logical<BoostMplIntegralConstant, int, int>();
-    IntegralConstant_enumerable<BoostMplIntegralConstant, int>();
-
-    IntegralConstant_monoid<BoostMplIntegralConstant, int, int>();
-    IntegralConstant_group<BoostMplIntegralConstant, int, int>();
-    IntegralConstant_ring<BoostMplIntegralConstant, int, int>();
-    IntegralConstant_integral_domain<BoostMplIntegralConstant, int, int>();
+    IntegralConstant_isomorphism<ext::boost::mpl::IntegralC, int, long>();
 }
diff --git a/test/ext/boost/mpl/vector/datatype.cpp b/test/ext/boost/mpl/vector/datatype.cpp
index c68cf3ae6..0aa4cc250 100644
--- a/test/ext/boost/mpl/vector/datatype.cpp
+++ b/test/ext/boost/mpl/vector/datatype.cpp
@@ -17,19 +17,19 @@ using namespace boost::hana;
 template <typename ...xs>
 struct check_datatype {
     static_assert(std::is_same<
-        datatype_t<boost::mpl::vector<xs...>>,
-        BoostMplVector
+        datatype_t< ::boost::mpl::vector<xs...>>,
+        ext::boost::mpl::Vector
     >{}, "");
 
     static_assert(std::is_same<
-        datatype_t<typename boost::mpl::vector<xs...>::type>,
-        BoostMplVector
+        datatype_t<typename ::boost::mpl::vector<xs...>::type>,
+        ext::boost::mpl::Vector
     >{}, "");
 
     struct mpl_id { template <typename x> struct apply { using type = x; }; };
     static_assert(std::is_same<
-        datatype_t<typename boost::mpl::transform<boost::mpl::vector<xs...>, mpl_id>::type>,
-        BoostMplVector
+        datatype_t<typename ::boost::mpl::transform< ::boost::mpl::vector<xs...>, mpl_id>::type>,
+        ext::boost::mpl::Vector
     >{}, "");
 };
 
diff --git a/test/ext/boost/mpl/vector/iterable.cpp b/test/ext/boost/mpl/vector/iterable.cpp
index d1042995e..de2c8c6a7 100644
--- a/test/ext/boost/mpl/vector/iterable.cpp
+++ b/test/ext/boost/mpl/vector/iterable.cpp
@@ -11,7 +11,6 @@ Distributed under the Boost Software License, Version 1.0.
 
 #include <boost/mpl/vector.hpp>
 using namespace boost::hana;
-namespace mpl = boost::mpl;
 
 
 struct x1; struct x2; struct x3;
@@ -19,27 +18,45 @@ struct x1; struct x2; struct x3;
 int main() {
     // head
     {
-        BOOST_HANA_CONSTANT_ASSERT(head(mpl::vector<x1>{}) == type<x1>);
-        BOOST_HANA_CONSTANT_ASSERT(head(mpl::vector<x1, x2>{}) == type<x1>);
-        BOOST_HANA_CONSTANT_ASSERT(head(mpl::vector<x1, x2, x3>{}) == type<x1>);
+        BOOST_HANA_CONSTANT_ASSERT(equal(
+            head(::boost::mpl::vector<x1>{}),
+            type<x1>
+        ));
+        BOOST_HANA_CONSTANT_ASSERT(equal(
+            head(::boost::mpl::vector<x1, x2>{}),
+            type<x1>
+        ));
+        BOOST_HANA_CONSTANT_ASSERT(equal(
+            head(::boost::mpl::vector<x1, x2, x3>{}),
+            type<x1>
+        ));
     }
 
     // tail
     {
-        BOOST_HANA_CONSTANT_ASSERT(equal(tail(mpl::vector<x1>{}), mpl::vector<>{}));
-        BOOST_HANA_CONSTANT_ASSERT(equal(tail(mpl::vector<x1, x2>{}), mpl::vector<x2>{}));
-        BOOST_HANA_CONSTANT_ASSERT(equal(tail(mpl::vector<x1, x2, x3>{}), mpl::vector<x2, x3>{}));
+        BOOST_HANA_CONSTANT_ASSERT(equal(
+            tail(::boost::mpl::vector<x1>{}),
+            ::boost::mpl::vector<>{}
+        ));
+        BOOST_HANA_CONSTANT_ASSERT(equal(
+            tail(::boost::mpl::vector<x1, x2>{}),
+            ::boost::mpl::vector<x2>{}
+        ));
+        BOOST_HANA_CONSTANT_ASSERT(equal(
+            tail(::boost::mpl::vector<x1, x2, x3>{}),
+            ::boost::mpl::vector<x2, x3>{}
+        ));
     }
 
     // is_empty
     {
-        BOOST_HANA_CONSTANT_ASSERT(is_empty(mpl::vector<>{}));
-        BOOST_HANA_CONSTANT_ASSERT(is_empty(mpl::vector0<>{}));
+        BOOST_HANA_CONSTANT_ASSERT(is_empty(::boost::mpl::vector<>{}));
+        BOOST_HANA_CONSTANT_ASSERT(is_empty(::boost::mpl::vector0<>{}));
 
-        BOOST_HANA_CONSTANT_ASSERT(not_(is_empty(mpl::vector<x1>{})));
-        BOOST_HANA_CONSTANT_ASSERT(not_(is_empty(mpl::vector1<x1>{})));
+        BOOST_HANA_CONSTANT_ASSERT(not_(is_empty(::boost::mpl::vector<x1>{})));
+        BOOST_HANA_CONSTANT_ASSERT(not_(is_empty(::boost::mpl::vector1<x1>{})));
 
-        BOOST_HANA_CONSTANT_ASSERT(not_(is_empty(mpl::vector<x1, x2>{})));
-        BOOST_HANA_CONSTANT_ASSERT(not_(is_empty(mpl::vector2<x1, x2>{})));
+        BOOST_HANA_CONSTANT_ASSERT(not_(is_empty(::boost::mpl::vector<x1, x2>{})));
+        BOOST_HANA_CONSTANT_ASSERT(not_(is_empty(::boost::mpl::vector2<x1, x2>{})));
     }
 }
diff --git a/test/ext/boost/mpl/vector/list.cpp b/test/ext/boost/mpl/vector/list.cpp
index f43219635..88e700dd6 100644
--- a/test/ext/boost/mpl/vector/list.cpp
+++ b/test/ext/boost/mpl/vector/list.cpp
@@ -11,7 +11,6 @@ Distributed under the Boost Software License, Version 1.0.
 
 #include <boost/mpl/vector.hpp>
 using namespace boost::hana;
-namespace mpl = boost::mpl;
 
 
 struct x1; struct x2; struct x3;
@@ -19,14 +18,29 @@ struct x1; struct x2; struct x3;
 int main() {
     // cons
     {
-        BOOST_HANA_CONSTANT_ASSERT(equal(cons(type<x1>, mpl::vector<>{}), mpl::vector<x1>{}));
-        BOOST_HANA_CONSTANT_ASSERT(equal(cons(type<x1>, mpl::vector<x2>{}), mpl::vector<x1, x2>{}));
-        BOOST_HANA_CONSTANT_ASSERT(equal(cons(type<x1>, mpl::vector<x2, x3>{}), mpl::vector<x1, x2, x3>{}));
+        BOOST_HANA_CONSTANT_ASSERT(equal(
+            cons(type<x1>, ::boost::mpl::vector<>{}),
+            ::boost::mpl::vector<x1>{}
+        ));
+        BOOST_HANA_CONSTANT_ASSERT(equal(
+            cons(type<x1>, ::boost::mpl::vector<x2>{}),
+            ::boost::mpl::vector<x1, x2>{}
+        ));
+        BOOST_HANA_CONSTANT_ASSERT(equal(
+            cons(type<x1>, ::boost::mpl::vector<x2, x3>{}),
+            ::boost::mpl::vector<x1, x2, x3>{}
+        ));
     }
 
     // nil
     {
-        BOOST_HANA_CONSTANT_ASSERT(equal(nil<BoostMplVector>, mpl::vector<>{}));
-        BOOST_HANA_CONSTANT_ASSERT(equal(nil<BoostMplVector>, mpl::vector0<>{}));
+        BOOST_HANA_CONSTANT_ASSERT(equal(
+            nil<ext::boost::mpl::Vector>,
+            ::boost::mpl::vector<>{}
+        ));
+        BOOST_HANA_CONSTANT_ASSERT(equal(
+            nil<ext::boost::mpl::Vector>,
+            ::boost::mpl::vector0<>{}
+        ));
     }
 }
diff --git a/test/ext/boost/tuple/datatype.cpp b/test/ext/boost/tuple/datatype.cpp
index 19a95543e..252cb2ac8 100644
--- a/test/ext/boost/tuple/datatype.cpp
+++ b/test/ext/boost/tuple/datatype.cpp
@@ -20,41 +20,41 @@ int main() {
 
     static_assert(std::is_same<
         datatype_t<decltype(boost::make_tuple())>,
-        BoostTuple
+        ext::boost::tuple
     >::value, "");
 
     static_assert(std::is_same<
         datatype_t<decltype(boost::make_tuple(1))>,
-        BoostTuple
+        ext::boost::tuple
     >::value, "");
 
     static_assert(std::is_same<
         datatype_t<decltype(boost::make_tuple(1, '2'))>,
-        BoostTuple
+        ext::boost::tuple
     >::value, "");
 
     static_assert(std::is_same<
         datatype_t<decltype(boost::make_tuple(1, '2', 3.3))>,
-        BoostTuple
+        ext::boost::tuple
     >::value, "");
 
     static_assert(std::is_same<
         datatype_t<decltype(make_cons(1, boost::tuples::null_type{}))>,
-        BoostTuple
+        ext::boost::tuple
     >::value, "");
 
     static_assert(std::is_same<
         datatype_t<decltype(make_cons(1, make_cons('2', boost::tuples::null_type{})))>,
-        BoostTuple
+        ext::boost::tuple
     >::value, "");
 
     static_assert(std::is_same<
         datatype_t<decltype(make_cons(1, boost::make_tuple('2', 3.3)))>,
-        BoostTuple
+        ext::boost::tuple
     >::value, "");
 
     static_assert(std::is_same<
         datatype_t<boost::tuples::null_type>,
-        BoostTuple
+        ext::boost::tuple
     >::value, "");
 }
diff --git a/test/ext/boost/tuple/iterable.cpp b/test/ext/boost/tuple/iterable.cpp
index a5688428c..037de61fa 100644
--- a/test/ext/boost/tuple/iterable.cpp
+++ b/test/ext/boost/tuple/iterable.cpp
@@ -11,5 +11,5 @@ using namespace boost::hana;
 
 
 int main() {
-    List_iterable<BoostTuple>();
+    List_iterable<ext::boost::tuple>();
 }
diff --git a/test/ext/boost/tuple/list.cpp b/test/ext/boost/tuple/list.cpp
index ff2e88c82..460c77f23 100644
--- a/test/ext/boost/tuple/list.cpp
+++ b/test/ext/boost/tuple/list.cpp
@@ -11,5 +11,5 @@ using namespace boost::hana;
 
 
 int main() {
-    List_methods<BoostTuple>();
+    List_methods<ext::boost::tuple>();
 }
diff --git a/test/ext/std/array/list.cpp b/test/ext/std/array/list.cpp
index 4f35d6c5a..0367ef0dc 100644
--- a/test/ext/std/array/list.cpp
+++ b/test/ext/std/array/list.cpp
@@ -20,9 +20,9 @@ constexpr auto array = std::array<int, sizeof...(i)>{{i...}};
 int main() {
     // nil
     {
-        BOOST_HANA_CONSTANT_ASSERT(equal(nil<StdArray>, std::array<char, 0>{}));
-        BOOST_HANA_CONSTANT_ASSERT(equal(nil<StdArray>, std::array<int, 0>{}));
-        BOOST_HANA_CONSTANT_ASSERT(equal(nil<StdArray>, std::array<long, 0>{}));
+        BOOST_HANA_CONSTANT_ASSERT(equal(nil<ext::std::Array>, std::array<char, 0>{}));
+        BOOST_HANA_CONSTANT_ASSERT(equal(nil<ext::std::Array>, std::array<int, 0>{}));
+        BOOST_HANA_CONSTANT_ASSERT(equal(nil<ext::std::Array>, std::array<long, 0>{}));
     }
 
     // cons
@@ -32,7 +32,7 @@ int main() {
         BOOST_HANA_CONSTEXPR_ASSERT(equal(cons(0, array<1, 2>), array<0, 1, 2>));
         BOOST_HANA_CONSTEXPR_ASSERT(equal(cons(0, array<1, 2, 3>), array<0, 1, 2, 3>));
 
-        BOOST_HANA_CONSTEXPR_ASSERT(equal(cons(0, nil<StdArray>), array<0>));
+        BOOST_HANA_CONSTEXPR_ASSERT(equal(cons(0, nil<ext::std::Array>), array<0>));
     }
 
     // laws
diff --git a/test/ext/std/integral_constant/bug_datatype_inheritance.cpp b/test/ext/std/integral_constant/bug_datatype_inheritance.cpp
index ddb1bc6b5..0da708093 100644
--- a/test/ext/std/integral_constant/bug_datatype_inheritance.cpp
+++ b/test/ext/std/integral_constant/bug_datatype_inheritance.cpp
@@ -22,12 +22,12 @@ struct empty { };
 struct non_pod { virtual ~non_pod() { } };
 
 int main() {
-    static_assert(std::is_same<datatype_t<inherit_simple>, StdIntegralConstant>{}, "");
-    static_assert(std::is_same<datatype_t<inherit_no_default>, StdIntegralConstant>{}, "");
-    static_assert(std::is_same<datatype_t<std::is_pointer<int*>>, StdIntegralConstant>{}, "");
+    static_assert(std::is_same<datatype_t<inherit_simple>, ext::std::IntegralConstant>{}, "");
+    static_assert(std::is_same<datatype_t<inherit_no_default>, ext::std::IntegralConstant>{}, "");
+    static_assert(std::is_same<datatype_t<std::is_pointer<int*>>, ext::std::IntegralConstant>{}, "");
 
-    static_assert(!std::is_same<datatype_t<incomplete>, StdIntegralConstant>{}, "");
-    static_assert(!std::is_same<datatype_t<empty>, StdIntegralConstant>{}, "");
-    static_assert(!std::is_same<datatype_t<non_pod>, StdIntegralConstant>{}, "");
-    static_assert(!std::is_same<datatype_t<void>, StdIntegralConstant>{}, "");
+    static_assert(!std::is_same<datatype_t<incomplete>, ext::std::IntegralConstant>{}, "");
+    static_assert(!std::is_same<datatype_t<empty>, ext::std::IntegralConstant>{}, "");
+    static_assert(!std::is_same<datatype_t<non_pod>, ext::std::IntegralConstant>{}, "");
+    static_assert(!std::is_same<datatype_t<void>, ext::std::IntegralConstant>{}, "");
 }
diff --git a/test/ext/std/integral_constant/integral_constant.cpp b/test/ext/std/integral_constant/integral_constant.cpp
index 6ded1d1ba..cb54349ea 100644
--- a/test/ext/std/integral_constant/integral_constant.cpp
+++ b/test/ext/std/integral_constant/integral_constant.cpp
@@ -6,25 +6,10 @@ Distributed under the Boost Software License, Version 1.0.
 
 #include <boost/hana/ext/std/integral_constant.hpp>
 
-#include <test/iso/integral_constant/comparable.hpp>
-#include <test/iso/integral_constant/enumerable.hpp>
-#include <test/iso/integral_constant/group.hpp>
-#include <test/iso/integral_constant/integral_domain.hpp>
-#include <test/iso/integral_constant/logical.hpp>
-#include <test/iso/integral_constant/monoid.hpp>
-#include <test/iso/integral_constant/orderable.hpp>
-#include <test/iso/integral_constant/ring.hpp>
+#include <test/iso/integral_constant.hpp>
 using namespace boost::hana;
 
 
 int main() {
-    IntegralConstant_comparable<StdIntegralConstant, int, int>();
-    IntegralConstant_orderable<StdIntegralConstant, int, int>();
-    IntegralConstant_logical<StdIntegralConstant, int, int>();
-    IntegralConstant_enumerable<StdIntegralConstant, int>();
-
-    IntegralConstant_monoid<StdIntegralConstant, int, int>();
-    IntegralConstant_group<StdIntegralConstant, int, int>();
-    IntegralConstant_ring<StdIntegralConstant, int, int>();
-    IntegralConstant_integral_domain<StdIntegralConstant, int, int>();
+    IntegralConstant_isomorphism<ext::std::IntegralConstant, int, long>();
 }
diff --git a/test/ext/std/pair/product.cpp b/test/ext/std/pair/product.cpp
index 6f08e0bd5..fd0273e3f 100644
--- a/test/ext/std/pair/product.cpp
+++ b/test/ext/std/pair/product.cpp
@@ -35,7 +35,7 @@ int main() {
     // make
     {
         BOOST_HANA_CONSTANT_ASSERT(equal(
-            make<StdPair>(x<0>, x<1>),
+            make<ext::std::Pair>(x<0>, x<1>),
             std::make_pair(x<0>, x<1>)
         ));
     }
diff --git a/test/ext/std/ratio/comparable.cpp b/test/ext/std/ratio/comparable.cpp
index 76df884fa..abe55f459 100644
--- a/test/ext/std/ratio/comparable.cpp
+++ b/test/ext/std/ratio/comparable.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/ext/std/ratio/comparable.hpp>
+#include <boost/hana/ext/std/ratio.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
diff --git a/test/ext/std/ratio/convert.cpp b/test/ext/std/ratio/convert.cpp
index a814251a6..854bdfd74 100644
--- a/test/ext/std/ratio/convert.cpp
+++ b/test/ext/std/ratio/convert.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/ext/std/ratio/convert.hpp>
-#include <boost/hana/ext/std/ratio/comparable.hpp>
+#include <boost/hana/ext/std/ratio.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
@@ -16,17 +15,17 @@ using namespace boost::hana;
 
 int main() {
     BOOST_HANA_CONSTANT_ASSERT(equal(
-        to<StdRatio>(test::cnumeric<int, 0>),
+        to<ext::std::Ratio>(test::cnumeric<int, 0>),
         std::ratio<0>{}
     ));
 
     BOOST_HANA_CONSTANT_ASSERT(equal(
-        to<StdRatio>(test::cnumeric<int, 1>),
+        to<ext::std::Ratio>(test::cnumeric<int, 1>),
         std::ratio<1>{}
     ));
 
     BOOST_HANA_CONSTANT_ASSERT(equal(
-        to<StdRatio>(test::cnumeric<int, 3>),
+        to<ext::std::Ratio>(test::cnumeric<int, 3>),
         std::ratio<3>{}
     ));
 }
diff --git a/test/ext/std/ratio/group.cpp b/test/ext/std/ratio/group.cpp
index 277adcd90..405304ac4 100644
--- a/test/ext/std/ratio/group.cpp
+++ b/test/ext/std/ratio/group.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/ext/std/ratio/group.hpp>
-#include <boost/hana/ext/std/ratio/comparable.hpp>
+#include <boost/hana/ext/std/ratio.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
@@ -25,7 +24,7 @@ int main() {
 
     // laws
     {
-        BOOST_HANA_CONSTANT_ASSERT(Group_laws<StdRatio>(
+        BOOST_HANA_CONSTANT_ASSERT(Group_laws<ext::std::Ratio>(
             std::ratio<0>{},
             std::ratio<1, 2>{},
             std::ratio<1, 3>{},
diff --git a/test/ext/std/ratio/integral_domain.cpp b/test/ext/std/ratio/integral_domain.cpp
index 2cbd20dee..fb213489f 100644
--- a/test/ext/std/ratio/integral_domain.cpp
+++ b/test/ext/std/ratio/integral_domain.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/ext/std/ratio/integral_domain.hpp>
-#include <boost/hana/ext/std/ratio/comparable.hpp>
+#include <boost/hana/ext/std/ratio.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
@@ -43,7 +42,7 @@ int main() {
 
     // laws
     {
-        BOOST_HANA_CONSTANT_ASSERT(IntegralDomain_laws<StdRatio>(
+        BOOST_HANA_CONSTANT_ASSERT(IntegralDomain_laws<ext::std::Ratio>(
             std::ratio<0>{},
             std::ratio<1, 2>{},
             std::ratio<1, 3>{},
diff --git a/test/ext/std/ratio/monoid.cpp b/test/ext/std/ratio/monoid.cpp
index 3313cf84f..7d2643ff4 100644
--- a/test/ext/std/ratio/monoid.cpp
+++ b/test/ext/std/ratio/monoid.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/ext/std/ratio/monoid.hpp>
-#include <boost/hana/ext/std/ratio/comparable.hpp>
+#include <boost/hana/ext/std/ratio.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
@@ -26,19 +25,19 @@ int main() {
     // zero
     {
         BOOST_HANA_CONSTANT_ASSERT(equal(
-            zero<StdRatio>,
+            zero<ext::std::Ratio>,
             std::ratio<0, 1>{}
         ));
 
         BOOST_HANA_CONSTANT_ASSERT(equal(
-            zero<StdRatio>,
+            zero<ext::std::Ratio>,
             std::ratio<0, 2>{}
         ));
     }
 
     // laws
     {
-        BOOST_HANA_CONSTANT_ASSERT(Monoid_laws<StdRatio>(
+        BOOST_HANA_CONSTANT_ASSERT(Monoid_laws<ext::std::Ratio>(
             std::ratio<0>{},
             std::ratio<1, 2>{},
             std::ratio<1, 3>{},
diff --git a/test/ext/std/ratio/orderable.cpp b/test/ext/std/ratio/orderable.cpp
index 0b771380a..722316d2d 100644
--- a/test/ext/std/ratio/orderable.cpp
+++ b/test/ext/std/ratio/orderable.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/ext/std/ratio/orderable.hpp>
+#include <boost/hana/ext/std/ratio.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
diff --git a/test/ext/std/ratio/ring.cpp b/test/ext/std/ratio/ring.cpp
index c1dc42840..3b86ebd79 100644
--- a/test/ext/std/ratio/ring.cpp
+++ b/test/ext/std/ratio/ring.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/ext/std/ratio/ring.hpp>
-#include <boost/hana/ext/std/ratio/comparable.hpp>
+#include <boost/hana/ext/std/ratio.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
@@ -26,19 +25,19 @@ int main() {
     // one
     {
         BOOST_HANA_CONSTANT_ASSERT(equal(
-            one<StdRatio>,
+            one<ext::std::Ratio>,
             std::ratio<1, 1>{}
         ));
 
         BOOST_HANA_CONSTANT_ASSERT(equal(
-            one<StdRatio>,
+            one<ext::std::Ratio>,
             std::ratio<2, 2>{}
         ));
     }
 
     // laws
     {
-        BOOST_HANA_CONSTANT_ASSERT(Ring_laws<StdRatio>(
+        BOOST_HANA_CONSTANT_ASSERT(Ring_laws<ext::std::Ratio>(
             std::ratio<0>{},
             std::ratio<1, 2>{},
             std::ratio<1, 3>{},
diff --git a/test/ext/std/tuple/applicative.cpp b/test/ext/std/tuple/applicative.cpp
deleted file mode 100644
index ea3e2017c..000000000
--- a/test/ext/std/tuple/applicative.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#include <boost/hana/ext/std/tuple/applicative.hpp>
-#include <boost/hana/ext/std/tuple/comparable.hpp>
-
-#include <test/iso/list/applicative.hpp>
-using namespace boost::hana;
-
-
-int main() {
-    List_applicative<StdTuple>();
-}
diff --git a/test/ext/std/tuple/bugs/libcxx_19616.cpp b/test/ext/std/tuple/bugs/libcxx_19616.cpp
index 8e4d205a0..a5de3a53c 100644
--- a/test/ext/std/tuple/bugs/libcxx_19616.cpp
+++ b/test/ext/std/tuple/bugs/libcxx_19616.cpp
@@ -17,7 +17,7 @@ int main() {
     // Make sure we workaround the bug at:
     // http://llvm.org/bugs/show_bug.cgi?id=19616
     BOOST_HANA_CONSTEXPR_ASSERT(equal(
-        lift<StdTuple>(std::make_tuple(1)),
+        lift<ext::std::Tuple>(std::make_tuple(1)),
         std::make_tuple(std::make_tuple(1))
     ));
 }
diff --git a/test/ext/std/tuple/functor.cpp b/test/ext/std/tuple/functor.cpp
deleted file mode 100644
index 5d88cdd50..000000000
--- a/test/ext/std/tuple/functor.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#include <boost/hana/ext/std/tuple/comparable.hpp>
-#include <boost/hana/ext/std/tuple/functor.hpp>
-
-#include <test/iso/list/functor.hpp>
-using namespace boost::hana;
-
-
-int main() {
-    List_functor<StdTuple>();
-}
diff --git a/test/ext/std/tuple/iterable.cpp b/test/ext/std/tuple/iterable.cpp
deleted file mode 100644
index 0cab9c0dc..000000000
--- a/test/ext/std/tuple/iterable.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#include <boost/hana/ext/std/tuple/comparable.hpp>
-#include <boost/hana/ext/std/tuple/iterable.hpp>
-
-#include <test/iso/list/iterable.hpp>
-using namespace boost::hana;
-
-
-int main() {
-    List_iterable<StdTuple>();
-}
diff --git a/test/ext/std/tuple/list.cpp b/test/ext/std/tuple/list.cpp
deleted file mode 100644
index 9c7c9a6f6..000000000
--- a/test/ext/std/tuple/list.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#include <boost/hana/ext/std/tuple/comparable.hpp>
-#include <boost/hana/ext/std/tuple/list.hpp>
-
-#include <test/iso/list/methods.hpp>
-using namespace boost::hana;
-
-
-int main() {
-    List_methods<StdTuple>();
-}
diff --git a/test/tuple/list.cpp b/test/ext/std/tuple/list_isomorphism.cpp
similarity index 60%
rename from test/tuple/list.cpp
rename to test/ext/std/tuple/list_isomorphism.cpp
index e8196de3d..cee55621a 100644
--- a/test/tuple/list.cpp
+++ b/test/ext/std/tuple/list_isomorphism.cpp
@@ -4,13 +4,12 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/tuple/comparable.hpp>
-#include <boost/hana/tuple/list.hpp>
+#include <boost/hana/ext/std/tuple.hpp>
 
-#include <test/iso/list/methods.hpp>
+#include <test/iso/list.hpp>
 using namespace boost::hana;
 
 
 int main() {
-    List_methods<Tuple>();
+    List_isomorphism<ext::std::Tuple>();
 }
diff --git a/test/ext/std/tuple/monad.cpp b/test/ext/std/tuple/monad.cpp
deleted file mode 100644
index db825f21b..000000000
--- a/test/ext/std/tuple/monad.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#include <boost/hana/ext/std/tuple/comparable.hpp>
-#include <boost/hana/ext/std/tuple/monad.hpp>
-
-#include <test/iso/list/monad.hpp>
-using namespace boost::hana;
-
-
-int main() {
-    List_monad<StdTuple>();
-}
diff --git a/test/foldable/product_mcd.cpp b/test/foldable/product_mcd.cpp
index f1c0215da..e4ded4822 100644
--- a/test/foldable/product_mcd.cpp
+++ b/test/foldable/product_mcd.cpp
@@ -4,10 +4,10 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/foldable/product_mcd.hpp>
-#include <boost/hana/product/mcd.hpp>
+#include <boost/hana/foldable.hpp>
 
 #include <boost/hana/detail/assert.hpp>
+#include <boost/hana/product.hpp>
 
 #include <test/injection.hpp>
 #include <test/laws/foldable.hpp>
diff --git a/test/foldable/record_mcd.cpp b/test/foldable/record_mcd.cpp
index d277d3891..84556c317 100644
--- a/test/foldable/record_mcd.cpp
+++ b/test/foldable/record_mcd.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/record/mcd.hpp>
+#include <boost/hana/record.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
diff --git a/test/foreign/comparable.cpp b/test/foreign/comparable.cpp
index 15e65051b..02dc476ba 100644
--- a/test/foreign/comparable.cpp
+++ b/test/foreign/comparable.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/foreign/comparable.hpp>
-#include <boost/hana/foreign/logical.hpp>
+#include <boost/hana/foreign.hpp>
 
 #include <boost/hana/core/is_a.hpp>
 #include <boost/hana/detail/assert.hpp>
diff --git a/test/foreign/enumerable.cpp b/test/foreign/enumerable.cpp
index 378971f80..0679e3d62 100644
--- a/test/foreign/enumerable.cpp
+++ b/test/foreign/enumerable.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/foreign/comparable.hpp>
-#include <boost/hana/foreign/enumerable.hpp>
+#include <boost/hana/foreign.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
diff --git a/test/foreign/foldable.cpp b/test/foreign/foldable.cpp
index 678e11dc3..a5adc5c26 100644
--- a/test/foreign/foldable.cpp
+++ b/test/foreign/foldable.cpp
@@ -4,9 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/foreign/comparable.hpp>
-#include <boost/hana/foreign/foldable.hpp>
-#include <boost/hana/foreign/logical.hpp> // for laws
+#include <boost/hana/foreign.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
diff --git a/test/foreign/group.cpp b/test/foreign/group.cpp
index b4a872422..fdca540a2 100644
--- a/test/foreign/group.cpp
+++ b/test/foreign/group.cpp
@@ -4,9 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/foreign/comparable.hpp>
-#include <boost/hana/foreign/group.hpp>
-#include <boost/hana/foreign/logical.hpp> // for laws
+#include <boost/hana/foreign.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
diff --git a/test/foreign/integral_domain.cpp b/test/foreign/integral_domain.cpp
index 8443e2e6f..e77e6c176 100644
--- a/test/foreign/integral_domain.cpp
+++ b/test/foreign/integral_domain.cpp
@@ -4,9 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/foreign/comparable.hpp>
-#include <boost/hana/foreign/integral_domain.hpp>
-#include <boost/hana/foreign/logical.hpp> // for laws
+#include <boost/hana/foreign.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
diff --git a/test/foreign/logical.cpp b/test/foreign/logical.cpp
index be6321017..033337aa3 100644
--- a/test/foreign/logical.cpp
+++ b/test/foreign/logical.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/foreign/comparable.hpp>
-#include <boost/hana/foreign/logical.hpp>
+#include <boost/hana/foreign.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
diff --git a/test/foreign/monoid.cpp b/test/foreign/monoid.cpp
index 757b19f51..ca5e621ad 100644
--- a/test/foreign/monoid.cpp
+++ b/test/foreign/monoid.cpp
@@ -4,9 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/foreign/comparable.hpp>
-#include <boost/hana/foreign/logical.hpp> // for laws
-#include <boost/hana/foreign/monoid.hpp>
+#include <boost/hana/foreign.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
diff --git a/test/foreign/orderable.cpp b/test/foreign/orderable.cpp
index ae64364cc..220f59bbc 100644
--- a/test/foreign/orderable.cpp
+++ b/test/foreign/orderable.cpp
@@ -4,9 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/foreign/comparable.hpp>
-#include <boost/hana/foreign/logical.hpp>
-#include <boost/hana/foreign/orderable.hpp>
+#include <boost/hana/foreign.hpp>
 
 #include <boost/hana/core/is_a.hpp>
 #include <boost/hana/detail/assert.hpp>
diff --git a/test/foreign/ring.cpp b/test/foreign/ring.cpp
index 0c5934ac3..3bd154766 100644
--- a/test/foreign/ring.cpp
+++ b/test/foreign/ring.cpp
@@ -4,9 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/foreign/comparable.hpp>
-#include <boost/hana/foreign/logical.hpp> // for laws
-#include <boost/hana/foreign/ring.hpp>
+#include <boost/hana/foreign.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
diff --git a/test/group/mcds.hpp b/test/group/mcds.hpp
index 9a9fc7547..f57c7d612 100644
--- a/test/group/mcds.hpp
+++ b/test/group/mcds.hpp
@@ -6,7 +6,7 @@ Distributed under the Boost Software License, Version 1.0.
 
 #include <boost/hana/core/operators.hpp>
 #include <boost/hana/detail/assert.hpp>
-#include <boost/hana/group/operators.hpp>
+#include <boost/hana/group.hpp>
 
 #include <test/laws/group.hpp>
 #include <test/numeric/comparable.hpp>
diff --git a/test/integral/comparable.cpp b/test/integral/comparable.cpp
deleted file mode 100644
index 1fd24d89b..000000000
--- a/test/integral/comparable.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#include <boost/hana/integral/comparable.hpp>
-
-#include <test/iso/integral_constant/comparable.hpp>
-using namespace boost::hana;
-
-
-int main() {
-    IntegralConstant_comparable<Integral, int, int>();
-    IntegralConstant_comparable<Integral, int, long>();
-}
diff --git a/test/integral/constant.cpp b/test/integral/constant.cpp
index a2ee8a0c6..803c38ae9 100644
--- a/test/integral/constant.cpp
+++ b/test/integral/constant.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/integral/constant.hpp>
+#include <boost/hana/integral.hpp>
 
 #include <test/laws/constant.hpp>
 using namespace boost::hana;
diff --git a/test/integral/enumerable.cpp b/test/integral/enumerable.cpp
deleted file mode 100644
index 5fd22c95e..000000000
--- a/test/integral/enumerable.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#include <boost/hana/integral/comparable.hpp>
-#include <boost/hana/integral/enumerable.hpp>
-
-#include <test/iso/integral_constant/enumerable.hpp>
-using namespace boost::hana;
-
-
-int main() {
-    IntegralConstant_enumerable<Integral, int>();
-    IntegralConstant_enumerable<Integral, short>();
-    IntegralConstant_enumerable<Integral, unsigned long>();
-}
diff --git a/test/integral/group.cpp b/test/integral/group.cpp
deleted file mode 100644
index 544d2f7ca..000000000
--- a/test/integral/group.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#include <boost/hana/integral/comparable.hpp>
-#include <boost/hana/integral/group.hpp>
-
-#include <test/iso/integral_constant/group.hpp>
-using namespace boost::hana;
-
-
-int main() {
-    IntegralConstant_group<Integral, int, short>();
-    IntegralConstant_group<Integral, int, int>();
-    IntegralConstant_group<Integral, int, long>();
-}
diff --git a/test/integral/integral_constant.cpp b/test/integral/integral_constant.cpp
deleted file mode 100644
index 56f5fdd79..000000000
--- a/test/integral/integral_constant.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#include <boost/hana/integral/comparable.hpp>
-#include <boost/hana/integral/integral_constant.hpp>
-
-#include <boost/hana/detail/assert.hpp>
-using namespace boost::hana;
-
-
-using T = int;
-constexpr T x = 3;
-
-int main() {
-    BOOST_HANA_CONSTANT_ASSERT(equal(
-        integral_constant<Integral, T, x>,
-        integral<T, x>
-    ));
-}
diff --git a/test/integral/integral_constant_isomorphism.cpp b/test/integral/integral_constant_isomorphism.cpp
new file mode 100644
index 000000000..e196e6e73
--- /dev/null
+++ b/test/integral/integral_constant_isomorphism.cpp
@@ -0,0 +1,22 @@
+/*
+@copyright Louis Dionne 2014
+Distributed under the Boost Software License, Version 1.0.
+(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+ */
+
+#include <boost/hana/integral.hpp>
+
+#include <test/iso/integral_constant.hpp>
+using namespace boost::hana;
+
+
+int main() {
+    BOOST_HANA_CONSTANT_ASSERT(equal(
+        integral_constant<Integral, int, 3>,
+        integral<int, 3>
+    ));
+
+    IntegralConstant_isomorphism<Integral, int, int>();
+    IntegralConstant_isomorphism<Integral, int, long>();
+    IntegralConstant_isomorphism<Integral, short, long>();
+}
diff --git a/test/integral/integral_domain.cpp b/test/integral/integral_domain.cpp
deleted file mode 100644
index 1fea6713c..000000000
--- a/test/integral/integral_domain.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#include <boost/hana/integral/comparable.hpp>
-#include <boost/hana/integral/integral_domain.hpp>
-
-#include <test/iso/integral_constant/integral_domain.hpp>
-using namespace boost::hana;
-
-
-int main() {
-    IntegralConstant_integral_domain<Integral, int, short>();
-    IntegralConstant_integral_domain<Integral, int, int>();
-    IntegralConstant_integral_domain<Integral, int, long>();
-}
diff --git a/test/integral/logical.cpp b/test/integral/logical.cpp
deleted file mode 100644
index 0a5efdb17..000000000
--- a/test/integral/logical.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#include <boost/hana/integral/comparable.hpp>
-#include <boost/hana/integral/logical.hpp>
-
-#include <test/iso/integral_constant/logical.hpp>
-using namespace boost::hana;
-
-
-int main() {
-    IntegralConstant_logical<Integral, int, int>();
-    IntegralConstant_logical<Integral, long, int>();
-}
diff --git a/test/integral/monoid.cpp b/test/integral/monoid.cpp
deleted file mode 100644
index da5aab200..000000000
--- a/test/integral/monoid.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#include <boost/hana/integral/comparable.hpp>
-#include <boost/hana/integral/monoid.hpp>
-
-#include <test/iso/integral_constant/monoid.hpp>
-using namespace boost::hana;
-
-
-int main() {
-    IntegralConstant_monoid<Integral, int, short>();
-    IntegralConstant_monoid<Integral, int, int>();
-    IntegralConstant_monoid<Integral, int, long>();
-}
diff --git a/test/integral/orderable.cpp b/test/integral/orderable.cpp
deleted file mode 100644
index eb6cb5e3b..000000000
--- a/test/integral/orderable.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#include <boost/hana/integral/comparable.hpp>
-#include <boost/hana/integral/orderable.hpp>
-
-#include <test/iso/integral_constant/orderable.hpp>
-using namespace boost::hana;
-
-
-int main() {
-    IntegralConstant_orderable<Integral, int, int>();
-    IntegralConstant_orderable<Integral, int, long long>();
-}
diff --git a/test/integral/ring.cpp b/test/integral/ring.cpp
deleted file mode 100644
index 0c483cbe3..000000000
--- a/test/integral/ring.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-@copyright Louis Dionne 2014
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
- */
-
-#include <boost/hana/integral/comparable.hpp>
-#include <boost/hana/integral/ring.hpp>
-
-#include <test/iso/integral_constant/ring.hpp>
-using namespace boost::hana;
-
-
-int main() {
-    IntegralConstant_ring<Integral, int, short>();
-    IntegralConstant_ring<Integral, int, int>();
-    IntegralConstant_ring<Integral, int, long>();
-}
diff --git a/test/integral_domain/mcd.cpp b/test/integral_domain/mcd.cpp
index dee86dfa4..ffdc0171d 100644
--- a/test/integral_domain/mcd.cpp
+++ b/test/integral_domain/mcd.cpp
@@ -6,7 +6,7 @@ Distributed under the Boost Software License, Version 1.0.
 
 #include <boost/hana/core/operators.hpp>
 #include <boost/hana/detail/assert.hpp>
-#include <boost/hana/integral_domain/operators.hpp>
+#include <boost/hana/integral_domain.hpp>
 
 #include <test/laws/integral_domain.hpp>
 #include <test/numeric/comparable.hpp>
diff --git a/test/iterable/mcd.cpp b/test/iterable/mcd.cpp
index 345687c84..f47a9d2aa 100644
--- a/test/iterable/mcd.cpp
+++ b/test/iterable/mcd.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/iterable/mcd.hpp>
+#include <boost/hana/iterable.hpp>
 
 #include <boost/hana/bool.hpp>
 #include <boost/hana/detail/assert.hpp>
diff --git a/test/lazy/applicative.cpp b/test/lazy/applicative.cpp
index 53c6fd676..23ccff6af 100644
--- a/test/lazy/applicative.cpp
+++ b/test/lazy/applicative.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/lazy/applicative.hpp>
+#include <boost/hana/lazy.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
diff --git a/test/lazy/functor.cpp b/test/lazy/functor.cpp
index 0416fbaa2..d8c5f3455 100644
--- a/test/lazy/functor.cpp
+++ b/test/lazy/functor.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/lazy/functor.hpp>
+#include <boost/hana/lazy.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
diff --git a/test/lazy/monad.cpp b/test/lazy/monad.cpp
index 8e60fdf5e..2d78b3118 100644
--- a/test/lazy/monad.cpp
+++ b/test/lazy/monad.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/lazy/monad.hpp>
+#include <boost/hana/lazy.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
diff --git a/test/logical/mcd.cpp b/test/logical/mcd.cpp
index fe06fe114..8634df95d 100644
--- a/test/logical/mcd.cpp
+++ b/test/logical/mcd.cpp
@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 #include <boost/hana/core/operators.hpp>
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
-#include <boost/hana/logical/operators.hpp>
+#include <boost/hana/logical.hpp>
 
 #include <test/cnumeric/comparable.hpp>
 #include <test/cnumeric/constant.hpp>
diff --git a/test/logical/runtime_mcd.cpp b/test/logical/runtime_mcd.cpp
index 266b9308e..3059e96e1 100644
--- a/test/logical/runtime_mcd.cpp
+++ b/test/logical/runtime_mcd.cpp
@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 #include <boost/hana/core/operators.hpp>
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
-#include <boost/hana/logical/operators.hpp>
+#include <boost/hana/logical.hpp>
 
 #include <test/numeric/comparable.hpp>
 #include <test/numeric/logical.hpp>
diff --git a/test/map/comparable.cpp b/test/map/comparable.cpp
index c1bb7c703..c125c953a 100644
--- a/test/map/comparable.cpp
+++ b/test/map/comparable.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/map/comparable.hpp>
+#include <boost/hana/map.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
diff --git a/test/map/convert.cpp b/test/map/convert.cpp
index 814dc537d..6e55ca61a 100644
--- a/test/map/convert.cpp
+++ b/test/map/convert.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/map/comparable.hpp>
-#include <boost/hana/map/convert.hpp>
+#include <boost/hana/map.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
diff --git a/test/map/searchable.cpp b/test/map/searchable.cpp
index 5ad0cde36..f17acdd33 100644
--- a/test/map/searchable.cpp
+++ b/test/map/searchable.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/map/searchable.hpp>
+#include <boost/hana/map.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
diff --git a/test/maybe/applicative.cpp b/test/maybe/applicative.cpp
index 17df6ef7e..f6ffcc162 100644
--- a/test/maybe/applicative.cpp
+++ b/test/maybe/applicative.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/maybe/applicative.hpp>
-#include <boost/hana/maybe/comparable.hpp>
+#include <boost/hana/maybe.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
diff --git a/test/maybe/comparable.cpp b/test/maybe/comparable.cpp
index 9545dd4e3..1b05181d1 100644
--- a/test/maybe/comparable.cpp
+++ b/test/maybe/comparable.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/maybe/comparable.hpp>
+#include <boost/hana/maybe.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
diff --git a/test/maybe/foldable.cpp b/test/maybe/foldable.cpp
index f11c9f692..5ae04f4cc 100644
--- a/test/maybe/foldable.cpp
+++ b/test/maybe/foldable.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/maybe/comparable.hpp>
-#include <boost/hana/maybe/foldable.hpp>
+#include <boost/hana/maybe.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
diff --git a/test/maybe/functor.cpp b/test/maybe/functor.cpp
index 36dd28304..06f8d60bc 100644
--- a/test/maybe/functor.cpp
+++ b/test/maybe/functor.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/maybe/comparable.hpp>
-#include <boost/hana/maybe/functor.hpp>
+#include <boost/hana/maybe.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
diff --git a/test/maybe/monad.cpp b/test/maybe/monad.cpp
index 3a80034db..72fc3f347 100644
--- a/test/maybe/monad.cpp
+++ b/test/maybe/monad.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/maybe/comparable.hpp>
-#include <boost/hana/maybe/monad.hpp>
+#include <boost/hana/maybe.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
diff --git a/test/maybe/searchable.cpp b/test/maybe/searchable.cpp
index e7028fe1f..90cceb9dc 100644
--- a/test/maybe/searchable.cpp
+++ b/test/maybe/searchable.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/maybe/comparable.hpp>
-#include <boost/hana/maybe/searchable.hpp>
+#include <boost/hana/maybe.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
diff --git a/test/maybe/traversable.cpp b/test/maybe/traversable.cpp
index 625539ed3..49c9bfd05 100644
--- a/test/maybe/traversable.cpp
+++ b/test/maybe/traversable.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/maybe/comparable.hpp>
-#include <boost/hana/maybe/traversable.hpp>
+#include <boost/hana/maybe.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
diff --git a/test/monad/mcds.hpp b/test/monad/mcds.hpp
index 00a201a08..5833874e3 100644
--- a/test/monad/mcds.hpp
+++ b/test/monad/mcds.hpp
@@ -8,7 +8,7 @@ Distributed under the Boost Software License, Version 1.0.
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
 #include <boost/hana/functional/compose.hpp>
-#include <boost/hana/monad/operators.hpp>
+#include <boost/hana/monad.hpp>
 
 #include <test/laws/monad.hpp>
 #include <test/identity/comparable.hpp>
diff --git a/test/monoid/mcd.cpp b/test/monoid/mcd.cpp
index 8444e5e09..37831fe0d 100644
--- a/test/monoid/mcd.cpp
+++ b/test/monoid/mcd.cpp
@@ -6,7 +6,7 @@ Distributed under the Boost Software License, Version 1.0.
 
 #include <boost/hana/core/operators.hpp>
 #include <boost/hana/detail/assert.hpp>
-#include <boost/hana/monoid/operators.hpp>
+#include <boost/hana/monoid.hpp>
 
 #include <test/laws/monoid.hpp>
 #include <test/numeric/comparable.hpp>
diff --git a/test/orderable/mcd.cpp b/test/orderable/mcd.cpp
index 25630c3fa..b053d7190 100644
--- a/test/orderable/mcd.cpp
+++ b/test/orderable/mcd.cpp
@@ -8,8 +8,8 @@ Distributed under the Boost Software License, Version 1.0.
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
 #include <boost/hana/foreign.hpp> //! @todo Find a way to get rid of this
-#include <boost/hana/logical/logical.hpp>
-#include <boost/hana/orderable/operators.hpp>
+#include <boost/hana/logical.hpp>
+#include <boost/hana/orderable.hpp>
 
 #include <test/laws/orderable.hpp>
 #include <test/injection.hpp>
diff --git a/test/pair/product.cpp b/test/pair/product.cpp
index 85a269835..1e4fdb074 100644
--- a/test/pair/product.cpp
+++ b/test/pair/product.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/pair/comparable.hpp>
-#include <boost/hana/pair/product.hpp>
+#include <boost/hana/pair.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <test/injection.hpp>
diff --git a/test/product/mcd.cpp b/test/product/mcd.cpp
index a4a3a0685..56dca0c42 100644
--- a/test/product/mcd.cpp
+++ b/test/product/mcd.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/product/mcd.hpp>
+#include <boost/hana/product.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
diff --git a/test/range/comparable.cpp b/test/range/comparable.cpp
index fd75f0975..161fd5cd0 100644
--- a/test/range/comparable.cpp
+++ b/test/range/comparable.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/range/comparable.hpp>
+#include <boost/hana/range.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/integral.hpp>
diff --git a/test/range/foldable.cpp b/test/range/foldable.cpp
index 1507df687..e240f7697 100644
--- a/test/range/foldable.cpp
+++ b/test/range/foldable.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/range/comparable.hpp>
-#include <boost/hana/range/foldable.hpp>
+#include <boost/hana/range.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
diff --git a/test/range/iterable.cpp b/test/range/iterable.cpp
index d28739b8f..5ebbeb7d6 100644
--- a/test/range/iterable.cpp
+++ b/test/range/iterable.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/range/comparable.hpp>
-#include <boost/hana/range/iterable.hpp>
+#include <boost/hana/range.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/integral.hpp>
diff --git a/test/record/bugs/fold_moveonly.cpp b/test/record/bugs/fold_moveonly.cpp
index 5745e497a..3450a01da 100644
--- a/test/record/bugs/fold_moveonly.cpp
+++ b/test/record/bugs/fold_moveonly.cpp
@@ -5,8 +5,8 @@ Distributed under the Boost Software License, Version 1.0.
  */
 
 #define BOOST_PP_VARIADICS 1
-#include <boost/hana/foldable/record_mcd.hpp>
-#include <boost/hana/record/macros.hpp>
+#include <boost/hana/foldable.hpp>
+#include <boost/hana/record_macros.hpp>
 
 #include <utility>
 using namespace boost::hana;
diff --git a/test/record/macros.cpp b/test/record/macros.cpp
index f6223530f..3be65438c 100644
--- a/test/record/macros.cpp
+++ b/test/record/macros.cpp
@@ -5,9 +5,9 @@ Distributed under the Boost Software License, Version 1.0.
  */
 
 #define BOOST_PP_VARIADICS 1
-#include <boost/hana/foldable/record_mcd.hpp>
-#include <boost/hana/record/macros.hpp>
-#include <boost/hana/searchable/record_mcd.hpp>
+#include <boost/hana/foldable.hpp>
+#include <boost/hana/record_macros.hpp>
+#include <boost/hana/searchable.hpp>
 
 #include <boost/hana/core/is_a.hpp>
 #include <boost/hana/detail/assert.hpp>
diff --git a/test/ring/mcd.cpp b/test/ring/mcd.cpp
index 70eeec06c..de2c79487 100644
--- a/test/ring/mcd.cpp
+++ b/test/ring/mcd.cpp
@@ -6,7 +6,7 @@ Distributed under the Boost Software License, Version 1.0.
 
 #include <boost/hana/core/operators.hpp>
 #include <boost/hana/detail/assert.hpp>
-#include <boost/hana/ring/operators.hpp>
+#include <boost/hana/ring.hpp>
 
 #include <test/laws/ring.hpp>
 #include <test/numeric/comparable.hpp>
diff --git a/test/sandbox/function.cpp b/test/sandbox/function.cpp
index 01d40358d..939997a1a 100644
--- a/test/sandbox/function.cpp
+++ b/test/sandbox/function.cpp
@@ -4,12 +4,12 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/comparable/equal_mcd.hpp>
+#include <boost/hana/comparable.hpp>
 #include <boost/hana/core/operators.hpp>
 #include <boost/hana/detail/constexpr.hpp>
-#include <boost/hana/functional.hpp>
 #include <boost/hana/foreign.hpp>
-#include <boost/hana/logical/logical.hpp>
+#include <boost/hana/functional.hpp>
+#include <boost/hana/logical.hpp>
 #include <boost/hana/tuple.hpp>
 
 #include <stdexcept>
diff --git a/test/sandbox/repeat.cpp b/test/sandbox/repeat.cpp
index 228a9dd74..d72f0de1f 100644
--- a/test/sandbox/repeat.cpp
+++ b/test/sandbox/repeat.cpp
@@ -9,9 +9,9 @@ Distributed under the Boost Software License, Version 1.0.
 #include <boost/hana/foreign.hpp>
 #include <boost/hana/functional.hpp>
 #include <boost/hana/integral.hpp>
-#include <boost/hana/iterable/mcd.hpp>
+#include <boost/hana/iterable.hpp>
 #include <boost/hana/lazy.hpp>
-#include <boost/hana/list/mcd.hpp>
+#include <boost/hana/list.hpp>
 #include <boost/hana/tuple.hpp>
 using namespace boost::hana;
 
diff --git a/test/sandbox/tree.cpp b/test/sandbox/tree.cpp
index 9caafe28e..b65ec242f 100644
--- a/test/sandbox/tree.cpp
+++ b/test/sandbox/tree.cpp
@@ -4,18 +4,20 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/applicative/mcd.hpp>
-#include <boost/hana/comparable/equal_mcd.hpp>
-#include <boost/hana/foldable/folds_mcd.hpp>
 #include <boost/hana/functional/curry.hpp>
 #include <boost/hana/functional/flip.hpp>
 #include <boost/hana/functional/partial.hpp>
-#include <boost/hana/functor/fmap_mcd.hpp>
-#include <boost/hana/list/list.hpp>
-#include <boost/hana/monad/flatten_mcd.hpp>
-#include <boost/hana/traversable/traverse_mcd.hpp>
 #include <boost/hana/tuple.hpp>
 
+// instances
+#include <boost/hana/applicative.hpp>
+#include <boost/hana/comparable.hpp>
+#include <boost/hana/foldable.hpp>
+#include <boost/hana/functor.hpp>
+#include <boost/hana/list.hpp>
+#include <boost/hana/monad.hpp>
+#include <boost/hana/traversable.hpp>
+
 #include <utility>
 
 
diff --git a/test/searchable/list_mcd.cpp b/test/searchable/list_mcd.cpp
index bb372c60d..54a826a26 100644
--- a/test/searchable/list_mcd.cpp
+++ b/test/searchable/list_mcd.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/list/mcd.hpp>
+#include <boost/hana/list.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
diff --git a/test/searchable/record_mcd.cpp b/test/searchable/record_mcd.cpp
index 180180e81..e2e3e0dea 100644
--- a/test/searchable/record_mcd.cpp
+++ b/test/searchable/record_mcd.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/record/mcd.hpp>
+#include <boost/hana/record.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
diff --git a/test/set/comparable.cpp b/test/set/comparable.cpp
index de2e08c41..dc289d8e6 100644
--- a/test/set/comparable.cpp
+++ b/test/set/comparable.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/set/comparable.hpp>
-#include <boost/hana/set/convert.hpp>
+#include <boost/hana/set.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/tuple.hpp>
diff --git a/test/set/convert.cpp b/test/set/convert.cpp
index daed847a6..6f4d9a529 100644
--- a/test/set/convert.cpp
+++ b/test/set/convert.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/set/comparable.hpp>
-#include <boost/hana/set/convert.hpp>
+#include <boost/hana/set.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
diff --git a/test/set/insert.cpp b/test/set/insert.cpp
index 229af35e9..13eb63e90 100644
--- a/test/set/insert.cpp
+++ b/test/set/insert.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/set/comparable.hpp>
-#include <boost/hana/set/insert.hpp>
+#include <boost/hana/set.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
diff --git a/test/set/make.cpp b/test/set/make.cpp
index 7f9b012f3..bc1458baf 100644
--- a/test/set/make.cpp
+++ b/test/set/make.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/set/comparable.hpp>
-#include <boost/hana/set/set.hpp>
+#include <boost/hana/set.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
diff --git a/test/set/searchable.cpp b/test/set/searchable.cpp
index 43e282060..ff1c164bd 100644
--- a/test/set/searchable.cpp
+++ b/test/set/searchable.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/set/searchable.hpp>
+#include <boost/hana/set.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
diff --git a/test/string/comparable.cpp b/test/string/comparable.cpp
index 72146c60a..bae321770 100644
--- a/test/string/comparable.cpp
+++ b/test/string/comparable.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/string/comparable.hpp>
+#include <boost/hana/string.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
diff --git a/test/string/constant.cpp b/test/string/constant.cpp
index 1e7d83adc..4a6d2f508 100644
--- a/test/string/constant.cpp
+++ b/test/string/constant.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/string/constant.hpp>
+#include <boost/hana/string.hpp>
 
 #include <test/laws/constant.hpp>
 using namespace boost::hana;
diff --git a/test/string/foldable.cpp b/test/string/foldable.cpp
index 13f49e209..84bc22bee 100644
--- a/test/string/foldable.cpp
+++ b/test/string/foldable.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/string/foldable.hpp>
+#include <boost/hana/string.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/integral.hpp>
diff --git a/test/string/iterable.cpp b/test/string/iterable.cpp
index 53f212541..2d6433bff 100644
--- a/test/string/iterable.cpp
+++ b/test/string/iterable.cpp
@@ -4,13 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/string/comparable.hpp>
-#include <boost/hana/string/iterable.hpp>
-
-//! @todo Either make it a requirement of Iterable to be convertible to a
-//! Tuple (since it's used in the laws), or require something strictly more
-//! general. Then, remove this include.
-#include <boost/hana/string/convert.hpp>
+#include <boost/hana/string.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/integral.hpp>
diff --git a/test/string/orderable.cpp b/test/string/orderable.cpp
index b0d5579cf..bcb298425 100644
--- a/test/string/orderable.cpp
+++ b/test/string/orderable.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/string/orderable.hpp>
+#include <boost/hana/string.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 
diff --git a/test/string/searchable.cpp b/test/string/searchable.cpp
index a529148fd..5dd18ffbe 100644
--- a/test/string/searchable.cpp
+++ b/test/string/searchable.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/string/searchable.hpp>
+#include <boost/hana/string.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/integral.hpp>
diff --git a/test/string/string.cpp b/test/string/string.cpp
index b6e2ad106..29ba8adc1 100644
--- a/test/string/string.cpp
+++ b/test/string/string.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/string/comparable.hpp>
-#include <boost/hana/string/string.hpp>
+#include <boost/hana/string.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 using namespace boost::hana;
diff --git a/test/test/cnumeric/comparable.hpp b/test/test/cnumeric/comparable.hpp
index 9746bb38c..d7171bfdc 100644
--- a/test/test/cnumeric/comparable.hpp
+++ b/test/test/cnumeric/comparable.hpp
@@ -16,7 +16,7 @@ Distributed under the Boost Software License, Version 1.0.
 
 #if defined(BOOST_HANA_TEST_COMPARABLE_EQUAL_MCD)
 
-#include <boost/hana/comparable/equal_mcd.hpp>
+#include <boost/hana/comparable.hpp>
 #include <test/cnumeric/logical.hpp>
 #include <test/cnumeric/cnumeric.hpp>
 
@@ -34,7 +34,7 @@ namespace boost { namespace hana {
 
 #else
 
-#include <boost/hana/comparable/not_equal_mcd.hpp>
+#include <boost/hana/comparable.hpp>
 #include <test/cnumeric/logical.hpp>
 #include <test/cnumeric/cnumeric.hpp>
 
diff --git a/test/test/cnumeric/constant.hpp b/test/test/cnumeric/constant.hpp
index 7cbd13204..a82183b21 100644
--- a/test/test/cnumeric/constant.hpp
+++ b/test/test/cnumeric/constant.hpp
@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_CNUMERIC_CONSTANT_HPP
 #define BOOST_HANA_TEST_TEST_CNUMERIC_CONSTANT_HPP
 
-#include <boost/hana/constant/mcd.hpp>
+#include <boost/hana/constant.hpp>
 #include <test/cnumeric/cnumeric.hpp>
 
 
diff --git a/test/test/cnumeric/integral_constant.hpp b/test/test/cnumeric/integral_constant.hpp
index 4ea959ad5..505002275 100644
--- a/test/test/cnumeric/integral_constant.hpp
+++ b/test/test/cnumeric/integral_constant.hpp
@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_CNUMERIC_INTEGRAL_CONSTANT_HPP
 #define BOOST_HANA_TEST_TEST_CNUMERIC_INTEGRAL_CONSTANT_HPP
 
-#include <boost/hana/integral_constant/mcd.hpp>
+#include <boost/hana/integral_constant.hpp>
 #include <test/cnumeric/cnumeric.hpp>
 
 // Mcd
diff --git a/test/test/cnumeric/logical.hpp b/test/test/cnumeric/logical.hpp
index bed1c8ccd..70543d343 100644
--- a/test/test/cnumeric/logical.hpp
+++ b/test/test/cnumeric/logical.hpp
@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_CNUMERIC_LOGICAL_HPP
 #define BOOST_HANA_TEST_TEST_CNUMERIC_LOGICAL_HPP
 
-#include <boost/hana/logical/mcd.hpp>
+#include <boost/hana/logical.hpp>
 #include <test/cnumeric/cnumeric.hpp>
 
 
diff --git a/test/test/cnumeric/orderable.hpp b/test/test/cnumeric/orderable.hpp
index 6fc1eeba2..d0ed5fcf0 100644
--- a/test/test/cnumeric/orderable.hpp
+++ b/test/test/cnumeric/orderable.hpp
@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_CNUMERIC_ORDERABLE_HPP
 #define BOOST_HANA_TEST_TEST_CNUMERIC_ORDERABLE_HPP
 
-#include <boost/hana/orderable/less_mcd.hpp>
+#include <boost/hana/orderable.hpp>
 #include <test/cnumeric/cnumeric.hpp>
 #include <test/cnumeric/logical.hpp>
 
diff --git a/test/test/equivalence_class.hpp b/test/test/equivalence_class.hpp
index f48218e31..16ea88bd9 100644
--- a/test/test/equivalence_class.hpp
+++ b/test/test/equivalence_class.hpp
@@ -23,7 +23,7 @@ namespace test {
 } // end namespace test
 
 
-#include <boost/hana/comparable/equal_mcd.hpp>
+#include <boost/hana/comparable.hpp>
 
 
 namespace boost { namespace hana {
diff --git a/test/test/identity/applicative.hpp b/test/test/identity/applicative.hpp
index 2b96f22b6..344a6a824 100644
--- a/test/test/identity/applicative.hpp
+++ b/test/test/identity/applicative.hpp
@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_IDENTITY_APPLICATIVE_HPP
 #define BOOST_HANA_TEST_TEST_IDENTITY_APPLICATIVE_HPP
 
-#include <boost/hana/applicative/mcd.hpp>
+#include <boost/hana/applicative.hpp>
 #include <test/identity/identity.hpp>
 
 // Mcd
diff --git a/test/test/identity/comparable.hpp b/test/test/identity/comparable.hpp
index 7c1ca623c..a3d13bb8e 100644
--- a/test/test/identity/comparable.hpp
+++ b/test/test/identity/comparable.hpp
@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_IDENTITY_COMPARABLE_HPP
 #define BOOST_HANA_TEST_TEST_IDENTITY_COMPARABLE_HPP
 
-#include <boost/hana/comparable/equal_mcd.hpp>
+#include <boost/hana/comparable.hpp>
 #include <test/identity/identity.hpp>
 
 
diff --git a/test/test/identity/functor.hpp b/test/test/identity/functor.hpp
index 908d07b94..a48127cf5 100644
--- a/test/test/identity/functor.hpp
+++ b/test/test/identity/functor.hpp
@@ -16,7 +16,7 @@ Distributed under the Boost Software License, Version 1.0.
 
 #if defined(BOOST_HANA_TEST_FUNCTOR_FMAP_MCD)
 
-#include <boost/hana/functor/fmap_mcd.hpp>
+#include <boost/hana/functor.hpp>
 #include <test/identity/identity.hpp>
 
 
@@ -34,8 +34,8 @@ namespace boost { namespace hana {
 
 #else
 
-#include <boost/hana/functor/adjust_mcd.hpp>
-#include <boost/hana/logical/logical.hpp>
+#include <boost/hana/functor.hpp>
+#include <boost/hana/logical.hpp>
 #include <test/identity/identity.hpp>
 
 
diff --git a/test/test/identity/monad.hpp b/test/test/identity/monad.hpp
index e5e728e17..595110296 100644
--- a/test/test/identity/monad.hpp
+++ b/test/test/identity/monad.hpp
@@ -16,7 +16,7 @@ Distributed under the Boost Software License, Version 1.0.
 
 #if defined(BOOST_HANA_TEST_MONAD_FLATTEN_MCD)
 
-#include <boost/hana/monad/flatten_mcd.hpp>
+#include <boost/hana/monad.hpp>
 #include <test/identity/identity.hpp>
 
 // Mcd
@@ -37,7 +37,7 @@ namespace boost { namespace hana {
 
 #else
 
-#include <boost/hana/monad/bind_mcd.hpp>
+#include <boost/hana/monad.hpp>
 #include <test/identity/identity.hpp>
 
 // Mcd
diff --git a/test/test/identity/orderable.hpp b/test/test/identity/orderable.hpp
index 75faceeee..40e845e41 100644
--- a/test/test/identity/orderable.hpp
+++ b/test/test/identity/orderable.hpp
@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_IDENTITY_ORDERABLE_HPP
 #define BOOST_HANA_TEST_TEST_IDENTITY_ORDERABLE_HPP
 
-#include <boost/hana/orderable/less_mcd.hpp>
+#include <boost/hana/orderable.hpp>
 #include <test/identity/identity.hpp>
 
 
diff --git a/test/test/injection.cpp b/test/test/injection.cpp
index ed80dde25..f52c3e597 100644
--- a/test/test/injection.cpp
+++ b/test/test/injection.cpp
@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
 #include <boost/hana/functional/infix.hpp>
-#include <boost/hana/logical/logical.hpp>
+#include <boost/hana/logical.hpp>
 #include <boost/hana/tuple.hpp>
 
 #include <test/injection.hpp>
diff --git a/test/test/injection.hpp b/test/test/injection.hpp
index 864d0997f..822216bdd 100644
--- a/test/test/injection.hpp
+++ b/test/test/injection.hpp
@@ -76,10 +76,10 @@ namespace test {
 
 
 #include <boost/hana/bool.hpp>
-#include <boost/hana/comparable/equal_mcd.hpp>
+#include <boost/hana/comparable.hpp>
 #include <boost/hana/detail/std/enable_if.hpp>
-#include <boost/hana/logical/logical.hpp>
-#include <boost/hana/orderable/less_mcd.hpp>
+#include <boost/hana/logical.hpp>
+#include <boost/hana/orderable.hpp>
 
 
 namespace boost { namespace hana {
diff --git a/test/test/iso/integral_constant.hpp b/test/test/iso/integral_constant.hpp
new file mode 100644
index 000000000..64d5524d4
--- /dev/null
+++ b/test/test/iso/integral_constant.hpp
@@ -0,0 +1,34 @@
+/*
+@copyright Louis Dionne 2014
+Distributed under the Boost Software License, Version 1.0.
+(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+ */
+
+#ifndef BOOST_HANA_TEST_TEST_ISO_INTEGRAL_CONSTANT_HPP
+#define BOOST_HANA_TEST_TEST_ISO_INTEGRAL_CONSTANT_HPP
+
+#include <test/iso/integral_constant/comparable.hpp>
+#include <test/iso/integral_constant/enumerable.hpp>
+#include <test/iso/integral_constant/group.hpp>
+#include <test/iso/integral_constant/integral_domain.hpp>
+#include <test/iso/integral_constant/logical.hpp>
+#include <test/iso/integral_constant/monoid.hpp>
+#include <test/iso/integral_constant/orderable.hpp>
+#include <test/iso/integral_constant/ring.hpp>
+
+
+template <typename I, typename T, typename U>
+void IntegralConstant_isomorphism() {
+    IntegralConstant_comparable<I, T, U>();
+    IntegralConstant_orderable<I, T, U>();
+
+    IntegralConstant_enumerable<I, T>();
+    IntegralConstant_logical<I, T, U>();
+
+    IntegralConstant_monoid<I, T, U>();
+    IntegralConstant_group<I, T, U>();
+    IntegralConstant_ring<I, T, U>();
+    IntegralConstant_integral_domain<I, T, U>();
+}
+
+#endif // !BOOST_HANA_TEST_TEST_ISO_INTEGRAL_CONSTANT_HPP
diff --git a/test/test/iso/integral_constant/comparable.hpp b/test/test/iso/integral_constant/comparable.hpp
index 345ad046a..826558af4 100644
--- a/test/test/iso/integral_constant/comparable.hpp
+++ b/test/test/iso/integral_constant/comparable.hpp
@@ -7,10 +7,10 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_ISO_INTEGRAL_CONSTANT_COMPARABLE_HPP
 #define BOOST_HANA_TEST_TEST_ISO_INTEGRAL_CONSTANT_COMPARABLE_HPP
 
-#include <boost/hana/comparable/comparable.hpp>
+#include <boost/hana/comparable.hpp>
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/foreign.hpp> // for Comparable_laws with foreign types
-#include <boost/hana/integral_constant/integral_constant.hpp>
+#include <boost/hana/integral_constant.hpp>
 
 #include <test/laws/comparable.hpp>
 
diff --git a/test/test/iso/integral_constant/enumerable.hpp b/test/test/iso/integral_constant/enumerable.hpp
index b386574a3..902e6db9c 100644
--- a/test/test/iso/integral_constant/enumerable.hpp
+++ b/test/test/iso/integral_constant/enumerable.hpp
@@ -7,10 +7,10 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_ISO_INTEGRAL_CONSTANT_ENUMERABLE_HPP
 #define BOOST_HANA_TEST_TEST_ISO_INTEGRAL_CONSTANT_ENUMERABLE_HPP
 
-#include <boost/hana/comparable/comparable.hpp>
+#include <boost/hana/comparable.hpp>
 #include <boost/hana/detail/assert.hpp>
-#include <boost/hana/enumerable/enumerable.hpp>
-#include <boost/hana/integral_constant/integral_constant.hpp>
+#include <boost/hana/enumerable.hpp>
+#include <boost/hana/integral_constant.hpp>
 
 
 template <typename I, typename T>
diff --git a/test/test/iso/integral_constant/group.hpp b/test/test/iso/integral_constant/group.hpp
index 380da3a3f..ca8ac0d78 100644
--- a/test/test/iso/integral_constant/group.hpp
+++ b/test/test/iso/integral_constant/group.hpp
@@ -7,11 +7,11 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_ISO_INTEGRAL_CONSTANT_GROUP_HPP
 #define BOOST_HANA_TEST_TEST_ISO_INTEGRAL_CONSTANT_GROUP_HPP
 
-#include <boost/hana/comparable/comparable.hpp>
+#include <boost/hana/comparable.hpp>
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/foreign.hpp> // for Group_laws with foreign types
-#include <boost/hana/group/group.hpp>
-#include <boost/hana/integral_constant/integral_constant.hpp>
+#include <boost/hana/group.hpp>
+#include <boost/hana/integral_constant.hpp>
 
 #include <test/laws/group.hpp>
 #include <type_traits>
diff --git a/test/test/iso/integral_constant/integral_domain.hpp b/test/test/iso/integral_constant/integral_domain.hpp
index af1bda109..a00b17730 100644
--- a/test/test/iso/integral_constant/integral_domain.hpp
+++ b/test/test/iso/integral_constant/integral_domain.hpp
@@ -7,11 +7,11 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_ISO_INTEGRAL_CONSTANT_INTEGRAL_DOMAIN_HPP
 #define BOOST_HANA_TEST_TEST_ISO_INTEGRAL_CONSTANT_INTEGRAL_DOMAIN_HPP
 
-#include <boost/hana/comparable/comparable.hpp>
+#include <boost/hana/comparable.hpp>
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/foreign.hpp> // for IntegralDomain_laws with foreign types
-#include <boost/hana/integral_constant/integral_constant.hpp>
-#include <boost/hana/integral_domain/integral_domain.hpp>
+#include <boost/hana/integral_constant.hpp>
+#include <boost/hana/integral_domain.hpp>
 
 #include <test/laws/integral_domain.hpp>
 #include <type_traits>
diff --git a/test/test/iso/integral_constant/logical.hpp b/test/test/iso/integral_constant/logical.hpp
index 5ed4078c4..9915ab6c7 100644
--- a/test/test/iso/integral_constant/logical.hpp
+++ b/test/test/iso/integral_constant/logical.hpp
@@ -7,10 +7,10 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_ISO_INTEGRAL_CONSTANT_LOGICAL_HPP
 #define BOOST_HANA_TEST_TEST_ISO_INTEGRAL_CONSTANT_LOGICAL_HPP
 
-#include <boost/hana/comparable/comparable.hpp>
+#include <boost/hana/comparable.hpp>
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
-#include <boost/hana/integral_constant/integral_constant.hpp>
+#include <boost/hana/integral_constant.hpp>
 
 #include <test/injection.hpp>
 
diff --git a/test/test/iso/integral_constant/monoid.hpp b/test/test/iso/integral_constant/monoid.hpp
index 8b168e960..a7fce454a 100644
--- a/test/test/iso/integral_constant/monoid.hpp
+++ b/test/test/iso/integral_constant/monoid.hpp
@@ -7,11 +7,11 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_ISO_INTEGRAL_CONSTANT_MONOID_HPP
 #define BOOST_HANA_TEST_TEST_ISO_INTEGRAL_CONSTANT_MONOID_HPP
 
-#include <boost/hana/comparable/comparable.hpp>
+#include <boost/hana/comparable.hpp>
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/foreign.hpp> // for Monoid_laws with foreign types
-#include <boost/hana/integral_constant/integral_constant.hpp>
-#include <boost/hana/monoid/monoid.hpp>
+#include <boost/hana/integral_constant.hpp>
+#include <boost/hana/monoid.hpp>
 
 #include <test/laws/monoid.hpp>
 #include <type_traits>
diff --git a/test/test/iso/integral_constant/orderable.hpp b/test/test/iso/integral_constant/orderable.hpp
index a11c26f57..6daac3748 100644
--- a/test/test/iso/integral_constant/orderable.hpp
+++ b/test/test/iso/integral_constant/orderable.hpp
@@ -7,11 +7,11 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_ISO_INTEGRAL_CONSTANT_ORDERABLE_HPP
 #define BOOST_HANA_TEST_TEST_ISO_INTEGRAL_CONSTANT_ORDERABLE_HPP
 
-#include <boost/hana/comparable/comparable.hpp>
+#include <boost/hana/comparable.hpp>
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/foreign.hpp> // for Orderable_laws with foreign types
-#include <boost/hana/integral_constant/integral_constant.hpp>
-#include <boost/hana/orderable/orderable.hpp>
+#include <boost/hana/integral_constant.hpp>
+#include <boost/hana/orderable.hpp>
 
 #include <test/laws/orderable.hpp>
 
diff --git a/test/test/iso/integral_constant/ring.hpp b/test/test/iso/integral_constant/ring.hpp
index eda23760a..fbf14182d 100644
--- a/test/test/iso/integral_constant/ring.hpp
+++ b/test/test/iso/integral_constant/ring.hpp
@@ -7,11 +7,11 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_ISO_INTEGRAL_CONSTANT_RING_HPP
 #define BOOST_HANA_TEST_TEST_ISO_INTEGRAL_CONSTANT_RING_HPP
 
-#include <boost/hana/comparable/comparable.hpp>
+#include <boost/hana/comparable.hpp>
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/foreign.hpp> // for Ring_laws with foreign types
-#include <boost/hana/integral_constant/integral_constant.hpp>
-#include <boost/hana/ring/ring.hpp>
+#include <boost/hana/integral_constant.hpp>
+#include <boost/hana/ring.hpp>
 
 #include <test/laws/ring.hpp>
 #include <type_traits>
diff --git a/test/test/iso/list.hpp b/test/test/iso/list.hpp
new file mode 100644
index 000000000..7930006b8
--- /dev/null
+++ b/test/test/iso/list.hpp
@@ -0,0 +1,28 @@
+/*
+@copyright Louis Dionne 2014
+Distributed under the Boost Software License, Version 1.0.
+(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+ */
+
+#ifndef BOOST_HANA_TEST_TEST_ISO_LIST_HPP
+#define BOOST_HANA_TEST_TEST_ISO_LIST_HPP
+
+#include <test/iso/list/applicative.hpp>
+#include <test/iso/list/functor.hpp>
+#include <test/iso/list/iterable.hpp>
+#include <test/iso/list/methods.hpp>
+#include <test/iso/list/monad.hpp>
+
+
+template <typename L>
+void List_isomorphism() {
+    List_methods<L>();
+
+    List_functor<L>();
+    List_applicative<L>();
+    List_monad<L>();
+
+    List_iterable<L>();
+}
+
+#endif // !BOOST_HANA_TEST_TEST_ISO_LIST_HPP
diff --git a/test/test/iso/list/applicative.hpp b/test/test/iso/list/applicative.hpp
index d8ea99c7f..fbf62d7b5 100644
--- a/test/test/iso/list/applicative.hpp
+++ b/test/test/iso/list/applicative.hpp
@@ -7,11 +7,11 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_ISO_LIST_APPLICATIVE_HPP
 #define BOOST_HANA_TEST_TEST_ISO_LIST_APPLICATIVE_HPP
 
-#include <boost/hana/applicative/applicative.hpp>
-#include <boost/hana/comparable/comparable.hpp>
+#include <boost/hana/applicative.hpp>
+#include <boost/hana/comparable.hpp>
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
-#include <boost/hana/list/list.hpp>
+#include <boost/hana/list.hpp>
 
 #include <test/injection.hpp>
 
diff --git a/test/test/iso/list/functor.hpp b/test/test/iso/list/functor.hpp
index d06b904e1..2e7ee30b1 100644
--- a/test/test/iso/list/functor.hpp
+++ b/test/test/iso/list/functor.hpp
@@ -7,11 +7,11 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_ISO_LIST_FUNCTOR_HPP
 #define BOOST_HANA_TEST_TEST_ISO_LIST_FUNCTOR_HPP
 
-#include <boost/hana/comparable/comparable.hpp>
+#include <boost/hana/comparable.hpp>
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
-#include <boost/hana/functor/functor.hpp>
-#include <boost/hana/list/list.hpp>
+#include <boost/hana/functor.hpp>
+#include <boost/hana/list.hpp>
 
 #include <test/injection.hpp>
 #include <test/laws/functor.hpp>
diff --git a/test/test/iso/list/iterable.hpp b/test/test/iso/list/iterable.hpp
index 119747677..c4a1721de 100644
--- a/test/test/iso/list/iterable.hpp
+++ b/test/test/iso/list/iterable.hpp
@@ -7,11 +7,11 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_ISO_LIST_ITERABLE_HPP
 #define BOOST_HANA_TEST_TEST_ISO_LIST_ITERABLE_HPP
 
-#include <boost/hana/comparable/comparable.hpp>
+#include <boost/hana/comparable.hpp>
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
-#include <boost/hana/iterable/iterable.hpp>
-#include <boost/hana/list/list.hpp>
+#include <boost/hana/iterable.hpp>
+#include <boost/hana/list.hpp>
 
 #include <test/injection.hpp>
 #include <test/laws/iterable.hpp>
diff --git a/test/test/iso/list/methods.hpp b/test/test/iso/list/methods.hpp
index 728d2441a..3ec216462 100644
--- a/test/test/iso/list/methods.hpp
+++ b/test/test/iso/list/methods.hpp
@@ -10,9 +10,9 @@ Distributed under the Boost Software License, Version 1.0.
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
 #include <boost/hana/functional/partial.hpp>
-#include <boost/hana/functor/functor.hpp>
+#include <boost/hana/functor.hpp>
 #include <boost/hana/integral.hpp>
-#include <boost/hana/list/list.hpp>
+#include <boost/hana/list.hpp>
 #include <boost/hana/maybe.hpp>
 
 #include <test/cnumeric/comparable.hpp>
diff --git a/test/test/iso/list/monad.hpp b/test/test/iso/list/monad.hpp
index 8be48a3f3..4b2521996 100644
--- a/test/test/iso/list/monad.hpp
+++ b/test/test/iso/list/monad.hpp
@@ -7,11 +7,11 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_ISO_LIST_MONAD_HPP
 #define BOOST_HANA_TEST_TEST_ISO_LIST_MONAD_HPP
 
-#include <boost/hana/comparable/comparable.hpp>
+#include <boost/hana/comparable.hpp>
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
-#include <boost/hana/monad/monad.hpp>
-#include <boost/hana/list/list.hpp>
+#include <boost/hana/list.hpp>
+#include <boost/hana/monad.hpp>
 
 #include <test/injection.hpp>
 #include <test/laws/monad.hpp>
diff --git a/test/test/laws/comparable.hpp b/test/test/laws/comparable.hpp
index 910acbf71..db3d214b3 100644
--- a/test/test/laws/comparable.hpp
+++ b/test/test/laws/comparable.hpp
@@ -7,9 +7,9 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_LAWS_COMPARABLE_HPP
 #define BOOST_HANA_TEST_TEST_LAWS_COMPARABLE_HPP
 
-#include <boost/hana/comparable/comparable.hpp>
+#include <boost/hana/comparable.hpp>
 #include <boost/hana/functional/infix.hpp>
-#include <boost/hana/logical/logical.hpp>
+#include <boost/hana/logical.hpp>
 
 
 template <typename ...Comparables>
diff --git a/test/test/laws/constant.hpp b/test/test/laws/constant.hpp
index e04fa7b7e..a25843336 100644
--- a/test/test/laws/constant.hpp
+++ b/test/test/laws/constant.hpp
@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_LAWS_CONSTANT_HPP
 #define BOOST_HANA_TEST_TEST_LAWS_CONSTANT_HPP
 
-#include <boost/hana/constant/constant.hpp>
+#include <boost/hana/constant.hpp>
 
 
 template <typename ...Constants>
diff --git a/test/test/laws/foldable.hpp b/test/test/laws/foldable.hpp
index 619eb9264..49de08a31 100644
--- a/test/test/laws/foldable.hpp
+++ b/test/test/laws/foldable.hpp
@@ -7,9 +7,9 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_LAWS_FOLDABLE_HPP
 #define BOOST_HANA_TEST_TEST_LAWS_FOLDABLE_HPP
 
-#include <boost/hana/comparable/comparable.hpp>
-#include <boost/hana/foldable/foldable.hpp>
-#include <boost/hana/logical/logical.hpp>
+#include <boost/hana/comparable.hpp>
+#include <boost/hana/foldable.hpp>
+#include <boost/hana/logical.hpp>
 #include <boost/hana/tuple.hpp>
 
 #include <test/injection.hpp>
diff --git a/test/test/laws/functor.hpp b/test/test/laws/functor.hpp
index e59f3a42f..9f43426ff 100644
--- a/test/test/laws/functor.hpp
+++ b/test/test/laws/functor.hpp
@@ -8,12 +8,12 @@ Distributed under the Boost Software License, Version 1.0.
 #define BOOST_HANA_TEST_TEST_LAWS_FUNCTOR_HPP
 
 #include <boost/hana/bool.hpp>
-#include <boost/hana/comparable/comparable.hpp>
+#include <boost/hana/comparable.hpp>
 #include <boost/hana/functional/always.hpp>
 #include <boost/hana/functional/compose.hpp>
 #include <boost/hana/functional/id.hpp>
-#include <boost/hana/functor/functor.hpp>
-#include <boost/hana/logical/logical.hpp>
+#include <boost/hana/functor.hpp>
+#include <boost/hana/logical.hpp>
 
 #include <test/injection.hpp>
 
diff --git a/test/test/laws/group.hpp b/test/test/laws/group.hpp
index 5e25fff90..954438656 100644
--- a/test/test/laws/group.hpp
+++ b/test/test/laws/group.hpp
@@ -7,10 +7,10 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_LAWS_GROUP_HPP
 #define BOOST_HANA_TEST_TEST_LAWS_GROUP_HPP
 
-#include <boost/hana/comparable/comparable.hpp>
-#include <boost/hana/group/group.hpp>
-#include <boost/hana/logical/logical.hpp>
-#include <boost/hana/monoid/monoid.hpp>
+#include <boost/hana/comparable.hpp>
+#include <boost/hana/group.hpp>
+#include <boost/hana/logical.hpp>
+#include <boost/hana/monoid.hpp>
 
 
 template <typename G, typename ...Group>
diff --git a/test/test/laws/integral_domain.hpp b/test/test/laws/integral_domain.hpp
index 28d05317d..d13aa380c 100644
--- a/test/test/laws/integral_domain.hpp
+++ b/test/test/laws/integral_domain.hpp
@@ -7,13 +7,13 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_LAWS_INTEGRAL_DOMAIN_HPP
 #define BOOST_HANA_TEST_TEST_LAWS_INTEGRAL_DOMAIN_HPP
 
-#include <boost/hana/comparable/comparable.hpp>
+#include <boost/hana/comparable.hpp>
 #include <boost/hana/functional/always.hpp>
 #include <boost/hana/functional/infix.hpp>
-#include <boost/hana/integral_domain/integral_domain.hpp>
-#include <boost/hana/logical/logical.hpp>
-#include <boost/hana/monoid/monoid.hpp>
-#include <boost/hana/ring/ring.hpp>
+#include <boost/hana/integral_domain.hpp>
+#include <boost/hana/logical.hpp>
+#include <boost/hana/monoid.hpp>
+#include <boost/hana/ring.hpp>
 
 
 template <typename D, typename ...Domain>
diff --git a/test/test/laws/iterable.hpp b/test/test/laws/iterable.hpp
index cad165bb1..ad40faa15 100644
--- a/test/test/laws/iterable.hpp
+++ b/test/test/laws/iterable.hpp
@@ -8,11 +8,11 @@ Distributed under the Boost Software License, Version 1.0.
 #define BOOST_HANA_TEST_TEST_LAWS_ITERABLE_HPP
 
 #include <boost/hana/bool.hpp>
-#include <boost/hana/comparable/comparable.hpp>
+#include <boost/hana/comparable.hpp>
 #include <boost/hana/functional/always.hpp>
 #include <boost/hana/functional/infix.hpp>
-#include <boost/hana/iterable/iterable.hpp>
-#include <boost/hana/logical/logical.hpp>
+#include <boost/hana/iterable.hpp>
+#include <boost/hana/logical.hpp>
 #include <boost/hana/tuple.hpp>
 
 
diff --git a/test/test/laws/list.hpp b/test/test/laws/list.hpp
index c18a7d910..42d83d793 100644
--- a/test/test/laws/list.hpp
+++ b/test/test/laws/list.hpp
@@ -7,10 +7,10 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_LAWS_LIST_HPP
 #define BOOST_HANA_TEST_TEST_LAWS_LIST_HPP
 
-#include <boost/hana/comparable/comparable.hpp>
+#include <boost/hana/comparable.hpp>
 #include <boost/hana/core/convert.hpp>
 #include <boost/hana/functional/infix.hpp>
-#include <boost/hana/logical/logical.hpp>
+#include <boost/hana/logical.hpp>
 #include <boost/hana/tuple.hpp>
 
 
diff --git a/test/test/laws/monad.hpp b/test/test/laws/monad.hpp
index 01e5d2010..0a189953b 100644
--- a/test/test/laws/monad.hpp
+++ b/test/test/laws/monad.hpp
@@ -7,11 +7,11 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_LAWS_MONAD_HPP
 #define BOOST_HANA_TEST_TEST_LAWS_MONAD_HPP
 
-#include <boost/hana/applicative/applicative.hpp>
-#include <boost/hana/comparable/comparable.hpp>
+#include <boost/hana/applicative.hpp>
+#include <boost/hana/comparable.hpp>
 #include <boost/hana/functional/compose.hpp>
-#include <boost/hana/logical/logical.hpp>
-#include <boost/hana/monad/monad.hpp>
+#include <boost/hana/logical.hpp>
+#include <boost/hana/monad.hpp>
 
 #include <test/injection.hpp>
 
diff --git a/test/test/laws/monoid.hpp b/test/test/laws/monoid.hpp
index fea15b9ed..2a53aaf7f 100644
--- a/test/test/laws/monoid.hpp
+++ b/test/test/laws/monoid.hpp
@@ -7,9 +7,9 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_LAWS_MONOID_HPP
 #define BOOST_HANA_TEST_TEST_LAWS_MONOID_HPP
 
-#include <boost/hana/comparable/comparable.hpp>
-#include <boost/hana/logical/logical.hpp>
-#include <boost/hana/monoid/monoid.hpp>
+#include <boost/hana/comparable.hpp>
+#include <boost/hana/logical.hpp>
+#include <boost/hana/monoid.hpp>
 
 
 template <typename M, typename ...Monoid>
diff --git a/test/test/laws/orderable.hpp b/test/test/laws/orderable.hpp
index 744dc1243..0109d8f10 100644
--- a/test/test/laws/orderable.hpp
+++ b/test/test/laws/orderable.hpp
@@ -8,8 +8,8 @@ Distributed under the Boost Software License, Version 1.0.
 #define BOOST_HANA_TEST_TEST_LAWS_ORDERABLE_HPP
 
 #include <boost/hana/functional/infix.hpp>
-#include <boost/hana/logical/logical.hpp>
-#include <boost/hana/orderable/orderable.hpp>
+#include <boost/hana/logical.hpp>
+#include <boost/hana/orderable.hpp>
 
 
 template <typename ...Orderables>
diff --git a/test/test/laws/ring.hpp b/test/test/laws/ring.hpp
index b00d21b28..0bfdef88f 100644
--- a/test/test/laws/ring.hpp
+++ b/test/test/laws/ring.hpp
@@ -7,10 +7,10 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_LAWS_RING_HPP
 #define BOOST_HANA_TEST_TEST_LAWS_RING_HPP
 
-#include <boost/hana/comparable/comparable.hpp>
-#include <boost/hana/logical/logical.hpp>
-#include <boost/hana/monoid/monoid.hpp>
-#include <boost/hana/ring/ring.hpp>
+#include <boost/hana/comparable.hpp>
+#include <boost/hana/logical.hpp>
+#include <boost/hana/monoid.hpp>
+#include <boost/hana/ring.hpp>
 
 
 template <typename R, typename ...Ring>
diff --git a/test/test/lazy_comparable.hpp b/test/test/lazy_comparable.hpp
index 8fc847f4a..392274b64 100644
--- a/test/test/lazy_comparable.hpp
+++ b/test/test/lazy_comparable.hpp
@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_LAZY_COMPARABLE_HPP
 #define BOOST_HANA_TEST_TEST_LAZY_COMPARABLE_HPP
 
-#include <boost/hana/comparable/equal_mcd.hpp>
+#include <boost/hana/comparable.hpp>
 #include <boost/hana/lazy.hpp>
 
 
diff --git a/test/test/minimal_list.hpp b/test/test/minimal_list.hpp
index d6371a308..3665e9d36 100644
--- a/test/test/minimal_list.hpp
+++ b/test/test/minimal_list.hpp
@@ -8,23 +8,11 @@ Distributed under the Boost Software License, Version 1.0.
 #define BOOST_HANA_TEST_TEST_MINIMAL_LIST_HPP
 
 #include <boost/hana/bool.hpp>
-#include <boost/hana/comparable/comparable.hpp>
 #include <boost/hana/detail/constexpr.hpp>
-#include <boost/hana/iterable/mcd.hpp>
-#include <boost/hana/list/mcd.hpp>
-#include <boost/hana/monad/monad.hpp>
 
-// Provided instances
-#include <boost/hana/applicative/list_mcd.hpp>
-#include <boost/hana/comparable/list_mcd.hpp>
-#include <boost/hana/foldable/iterable_mcd.hpp>
-#include <boost/hana/functor/list_mcd.hpp>
-#include <boost/hana/monad/list_mcd.hpp>
-#include <boost/hana/searchable/list_mcd.hpp>
-#include <boost/hana/traversable/list_mcd.hpp>
-
-// Conversions
-#include <boost/hana/list/convert.hpp>
+// instances
+#include <boost/hana/iterable.hpp>
+#include <boost/hana/list.hpp>
 
 
 namespace test {
diff --git a/test/test/minimal_product.hpp b/test/test/minimal_product.hpp
index 0f8c00a9d..2d51d91ea 100644
--- a/test/test/minimal_product.hpp
+++ b/test/test/minimal_product.hpp
@@ -7,10 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_MINIMAL_PRODUCT_HPP
 #define BOOST_HANA_TEST_TEST_MINIMAL_PRODUCT_HPP
 
-#include <boost/hana/product/mcd.hpp>
-
-// Provided instances
-#include <boost/hana/comparable/product_mcd.hpp>
+#include <boost/hana/product.hpp>
 
 
 namespace test {
diff --git a/test/test/minimal_record.hpp b/test/test/minimal_record.hpp
index a75280b03..bdfd40bd3 100644
--- a/test/test/minimal_record.hpp
+++ b/test/test/minimal_record.hpp
@@ -7,17 +7,12 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_MINIMAL_RECORD_HPP
 #define BOOST_HANA_TEST_TEST_MINIMAL_RECORD_HPP
 
-#include <boost/hana/record/mcd.hpp>
+#include <boost/hana/record.hpp>
 
 #include <boost/hana/detail/constexpr.hpp>
 #include <boost/hana/pair.hpp>
 #include <boost/hana/tuple.hpp>
 
-// Provided instances
-#include <boost/hana/comparable/record_mcd.hpp>
-#include <boost/hana/foldable/record_mcd.hpp>
-#include <boost/hana/searchable/record_mcd.hpp>
-
 #include <test/injection.hpp>
 
 
diff --git a/test/test/numeric/comparable.hpp b/test/test/numeric/comparable.hpp
index f51b76f92..145dcb031 100644
--- a/test/test/numeric/comparable.hpp
+++ b/test/test/numeric/comparable.hpp
@@ -16,7 +16,7 @@ Distributed under the Boost Software License, Version 1.0.
 
 #if defined(BOOST_HANA_TEST_COMPARABLE_EQUAL_MCD)
 
-#include <boost/hana/comparable/equal_mcd.hpp>
+#include <boost/hana/comparable.hpp>
 #include <test/numeric/logical.hpp>
 #include <test/numeric/numeric.hpp>
 
@@ -34,7 +34,7 @@ namespace boost { namespace hana {
 
 #else
 
-#include <boost/hana/comparable/not_equal_mcd.hpp>
+#include <boost/hana/comparable.hpp>
 #include <test/numeric/logical.hpp>
 #include <test/numeric/numeric.hpp>
 
diff --git a/test/test/numeric/enumerable.hpp b/test/test/numeric/enumerable.hpp
index 1e9b1c907..da514150a 100644
--- a/test/test/numeric/enumerable.hpp
+++ b/test/test/numeric/enumerable.hpp
@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_NUMERIC_ENUMERABLE_HPP
 #define BOOST_HANA_TEST_TEST_NUMERIC_ENUMERABLE_HPP
 
-#include <boost/hana/enumerable/mcd.hpp>
+#include <boost/hana/enumerable.hpp>
 #include <test/numeric/numeric.hpp>
 
 
diff --git a/test/test/numeric/group.hpp b/test/test/numeric/group.hpp
index a026bbada..5d1aa3226 100644
--- a/test/test/numeric/group.hpp
+++ b/test/test/numeric/group.hpp
@@ -17,7 +17,7 @@ Distributed under the Boost Software License, Version 1.0.
 #if defined(BOOST_HANA_TEST_GROUP_NEGATE_MCD)
 
 #include <test/numeric/numeric.hpp>
-#include <boost/hana/group/negate_mcd.hpp>
+#include <boost/hana/group.hpp>
 #include <test/numeric/monoid.hpp>
 
 namespace boost { namespace hana {
@@ -34,7 +34,7 @@ namespace boost { namespace hana {
 #else
 
 #include <test/numeric/numeric.hpp>
-#include <boost/hana/group/minus_mcd.hpp>
+#include <boost/hana/group.hpp>
 #include <test/numeric/monoid.hpp>
 
 namespace boost { namespace hana {
diff --git a/test/test/numeric/integral_domain.hpp b/test/test/numeric/integral_domain.hpp
index 5b82353d5..dbb4ff70e 100644
--- a/test/test/numeric/integral_domain.hpp
+++ b/test/test/numeric/integral_domain.hpp
@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_NUMERIC_INTEGRAL_DOMAIN_HPP
 #define BOOST_HANA_TEST_TEST_NUMERIC_INTEGRAL_DOMAIN_HPP
 
-#include <boost/hana/integral_domain/mcd.hpp>
+#include <boost/hana/integral_domain.hpp>
 #include <test/numeric/numeric.hpp>
 
 // Mcd
diff --git a/test/test/numeric/logical.hpp b/test/test/numeric/logical.hpp
index 57c57f103..fedc43202 100644
--- a/test/test/numeric/logical.hpp
+++ b/test/test/numeric/logical.hpp
@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_NUMERIC_LOGICAL_HPP
 #define BOOST_HANA_TEST_TEST_NUMERIC_LOGICAL_HPP
 
-#include <boost/hana/logical/mcd.hpp>
+#include <boost/hana/logical.hpp>
 #include <test/numeric/numeric.hpp>
 
 
diff --git a/test/test/numeric/monoid.hpp b/test/test/numeric/monoid.hpp
index e81fecb44..25298ddb7 100644
--- a/test/test/numeric/monoid.hpp
+++ b/test/test/numeric/monoid.hpp
@@ -8,7 +8,7 @@ Distributed under the Boost Software License, Version 1.0.
 #define BOOST_HANA_TEST_TEST_NUMERIC_MONOID_HPP
 
 #include <boost/hana/detail/constexpr.hpp>
-#include <boost/hana/monoid/mcd.hpp>
+#include <boost/hana/monoid.hpp>
 #include <test/numeric/numeric.hpp>
 
 
diff --git a/test/test/numeric/orderable.hpp b/test/test/numeric/orderable.hpp
index 8a469a97f..2e8422ca3 100644
--- a/test/test/numeric/orderable.hpp
+++ b/test/test/numeric/orderable.hpp
@@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_HANA_TEST_TEST_NUMERIC_ORDERABLE_HPP
 #define BOOST_HANA_TEST_TEST_NUMERIC_ORDERABLE_HPP
 
-#include <boost/hana/orderable/less_mcd.hpp>
+#include <boost/hana/orderable.hpp>
 #include <test/numeric/logical.hpp>
 #include <test/numeric/numeric.hpp>
 
diff --git a/test/test/numeric/ring.hpp b/test/test/numeric/ring.hpp
index 55c48d230..6fc1c8f7b 100644
--- a/test/test/numeric/ring.hpp
+++ b/test/test/numeric/ring.hpp
@@ -8,7 +8,7 @@ Distributed under the Boost Software License, Version 1.0.
 #define BOOST_HANA_TEST_TEST_NUMERIC_RING_HPP
 
 #include <boost/hana/detail/constexpr.hpp>
-#include <boost/hana/ring/mcd.hpp>
+#include <boost/hana/ring.hpp>
 #include <test/numeric/numeric.hpp>
 
 // Mcd
diff --git a/test/test/seq/applicative.hpp b/test/test/seq/applicative.hpp
index 8c7296360..21341b192 100644
--- a/test/test/seq/applicative.hpp
+++ b/test/test/seq/applicative.hpp
@@ -9,6 +9,6 @@ Distributed under the Boost Software License, Version 1.0.
 
 #include <test/seq/list.hpp>
 #include <test/seq/functor.hpp>
-#include <boost/hana/applicative/list_mcd.hpp>
+#include <boost/hana/applicative.hpp>
 
 #endif //! BOOST_HANA_TEST_TEST_SEQ_APPLICATIVE_HPP
diff --git a/test/test/seq/comparable.hpp b/test/test/seq/comparable.hpp
index a54aeca91..de6b65f6b 100644
--- a/test/test/seq/comparable.hpp
+++ b/test/test/seq/comparable.hpp
@@ -8,6 +8,6 @@ Distributed under the Boost Software License, Version 1.0.
 #define BOOST_HANA_TEST_TEST_SEQ_COMPARABLE_HPP
 
 #include <test/seq/list.hpp>
-#include <boost/hana/comparable/list_mcd.hpp>
+#include <boost/hana/comparable.hpp>
 
 #endif //! BOOST_HANA_TEST_TEST_SEQ_COMPARABLE_HPP
diff --git a/test/test/seq/convert.hpp b/test/test/seq/convert.hpp
index af87f14c5..4c8baff28 100644
--- a/test/test/seq/convert.hpp
+++ b/test/test/seq/convert.hpp
@@ -8,6 +8,6 @@ Distributed under the Boost Software License, Version 1.0.
 #define BOOST_HANA_TEST_TEST_SEQ_CONVERT_HPP
 
 #include <test/seq/list.hpp>
-#include <boost/hana/list/convert.hpp>
+#include <boost/hana/list.hpp>
 
 #endif //! BOOST_HANA_TEST_TEST_SEQ_CONVERT_HPP
diff --git a/test/test/seq/foldable.hpp b/test/test/seq/foldable.hpp
index 68d70493e..fdb06c628 100644
--- a/test/test/seq/foldable.hpp
+++ b/test/test/seq/foldable.hpp
@@ -17,7 +17,7 @@ Distributed under the Boost Software License, Version 1.0.
 
 #if defined(BOOST_HANA_TEST_FOLDABLE_FOLDS_MCD)
 
-#include <boost/hana/foldable/folds_mcd.hpp>
+#include <boost/hana/foldable.hpp>
 #include <test/seq/seq.hpp>
 
 
@@ -60,7 +60,7 @@ namespace boost { namespace hana {
 
 #elif defined(BOOST_HANA_TEST_FOLDABLE_UNPACK_MCD)
 
-#include <boost/hana/foldable/unpack_mcd.hpp>
+#include <boost/hana/foldable.hpp>
 #include <test/seq/seq.hpp>
 
 
@@ -78,7 +78,7 @@ namespace boost { namespace hana {
 #else
 
 #include <test/seq/iterable.hpp>
-#include <boost/hana/foldable/iterable_mcd.hpp>
+#include <boost/hana/foldable.hpp>
 
 #endif
 
diff --git a/test/test/seq/functor.hpp b/test/test/seq/functor.hpp
index 39558ab66..ef5c2aa76 100644
--- a/test/test/seq/functor.hpp
+++ b/test/test/seq/functor.hpp
@@ -8,6 +8,6 @@ Distributed under the Boost Software License, Version 1.0.
 #define BOOST_HANA_TEST_TEST_SEQ_FUNCTOR_HPP
 
 #include <test/seq/list.hpp>
-#include <boost/hana/functor/list_mcd.hpp>
+#include <boost/hana/functor.hpp>
 
 #endif //! BOOST_HANA_TEST_TEST_SEQ_FUNCTOR_HPP
diff --git a/test/test/seq/iterable.hpp b/test/test/seq/iterable.hpp
index 33cfaef24..7f9c66cd9 100644
--- a/test/test/seq/iterable.hpp
+++ b/test/test/seq/iterable.hpp
@@ -8,7 +8,7 @@ Distributed under the Boost Software License, Version 1.0.
 #define BOOST_HANA_TEST_TEST_SEQ_ITERABLE_HPP
 
 #include <boost/hana/bool.hpp>
-#include <boost/hana/iterable/mcd.hpp>
+#include <boost/hana/iterable.hpp>
 #include <test/seq/seq.hpp>
 
 
diff --git a/test/test/seq/list.hpp b/test/test/seq/list.hpp
index 2e9c4b34e..2d04bc3f5 100644
--- a/test/test/seq/list.hpp
+++ b/test/test/seq/list.hpp
@@ -8,7 +8,7 @@ Distributed under the Boost Software License, Version 1.0.
 #define BOOST_HANA_TEST_TEST_SEQ_LIST_HPP
 
 #include <boost/hana/detail/constexpr.hpp>
-#include <boost/hana/list/mcd.hpp>
+#include <boost/hana/list.hpp>
 #include <test/seq/seq.hpp>
 
 // MCD
diff --git a/test/test/seq/monad.hpp b/test/test/seq/monad.hpp
index ff22987a1..e4ae3e1cd 100644
--- a/test/test/seq/monad.hpp
+++ b/test/test/seq/monad.hpp
@@ -10,6 +10,6 @@ Distributed under the Boost Software License, Version 1.0.
 #include <test/seq/list.hpp>
 #include <test/seq/functor.hpp>
 #include <test/seq/applicative.hpp>
-#include <boost/hana/monad/list_mcd.hpp>
+#include <boost/hana/monad.hpp>
 
 #endif //! BOOST_HANA_TEST_TEST_SEQ_MONAD_HPP
diff --git a/test/test/seq/searchable.hpp b/test/test/seq/searchable.hpp
index 9a3b3cc27..182bd0da4 100644
--- a/test/test/seq/searchable.hpp
+++ b/test/test/seq/searchable.hpp
@@ -8,6 +8,6 @@ Distributed under the Boost Software License, Version 1.0.
 #define BOOST_HANA_TEST_TEST_SEQ_SEARCHABLE_HPP
 
 #include <test/seq/list.hpp>
-#include <boost/hana/searchable/list_mcd.hpp>
+#include <boost/hana/searchable.hpp>
 
 #endif //! BOOST_HANA_TEST_TEST_SEQ_SEARCHABLE_HPP
diff --git a/test/test/seq/seq.hpp b/test/test/seq/seq.hpp
index 4fa8860b7..6331b505b 100644
--- a/test/test/seq/seq.hpp
+++ b/test/test/seq/seq.hpp
@@ -8,7 +8,7 @@ Distributed under the Boost Software License, Version 1.0.
 #define BOOST_HANA_TEST_TEST_SEQ_SEQ_HPP
 
 #include <boost/hana/detail/constexpr.hpp>
-#include <boost/hana/iterable/operators.hpp>
+#include <boost/hana/iterable.hpp>
 
 
 namespace test {
diff --git a/test/test/seq/traversable.hpp b/test/test/seq/traversable.hpp
index 07446b4ea..606dc2273 100644
--- a/test/test/seq/traversable.hpp
+++ b/test/test/seq/traversable.hpp
@@ -8,6 +8,6 @@ Distributed under the Boost Software License, Version 1.0.
 #define BOOST_HANA_TEST_TEST_SEQ_TRAVERSABLE_HPP
 
 #include <test/seq/list.hpp>
-#include <boost/hana/traversable/list_mcd.hpp>
+#include <boost/hana/traversable.hpp>
 
 #endif //! BOOST_HANA_TEST_TEST_SEQ_TRAVERSABLE_HPP
diff --git a/test/traversable/list_mcd.cpp b/test/traversable/list_mcd.cpp
index 078747892..f60601b84 100644
--- a/test/traversable/list_mcd.cpp
+++ b/test/traversable/list_mcd.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/list/mcd.hpp>
+#include <boost/hana/list.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
diff --git a/test/traversable/mcd.cpp b/test/traversable/mcd.cpp
index 6cf446251..c5425f581 100644
--- a/test/traversable/mcd.cpp
+++ b/test/traversable/mcd.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/traversable/traverse_mcd.hpp>
+#include <boost/hana/traversable.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
diff --git a/test/tuple/foldable.cpp b/test/tuple/foldable.cpp
index 3c40c7aca..2ee38cd54 100644
--- a/test/tuple/foldable.cpp
+++ b/test/tuple/foldable.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/tuple/comparable.hpp>
-#include <boost/hana/tuple/foldable.hpp>
+#include <boost/hana/tuple.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/detail/constexpr.hpp>
diff --git a/test/tuple/iterable.cpp b/test/tuple/iterable.cpp
index 55f1b030e..f619a0196 100644
--- a/test/tuple/iterable.cpp
+++ b/test/tuple/iterable.cpp
@@ -4,8 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/tuple/comparable.hpp>
-#include <boost/hana/tuple/iterable.hpp>
+#include <boost/hana/tuple.hpp>
 
 #include <boost/hana/detail/assert.hpp>
 #include <boost/hana/integral.hpp>
diff --git a/test/tuple/functor.cpp b/test/tuple/list_isomorphism.cpp
similarity index 52%
rename from test/tuple/functor.cpp
rename to test/tuple/list_isomorphism.cpp
index 25176337e..5ae82e652 100644
--- a/test/tuple/functor.cpp
+++ b/test/tuple/list_isomorphism.cpp
@@ -4,13 +4,11 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/tuple/comparable.hpp>
-#include <boost/hana/tuple/functor.hpp>
+#include <boost/hana/tuple.hpp>
 
-#include <test/iso/list/functor.hpp>
-using namespace boost::hana;
+#include <test/iso/list.hpp>
 
 
 int main() {
-    List_functor<Tuple>();
+    List_isomorphism<boost::hana::Tuple>();
 }
diff --git a/test/tuple/tuple.cpp b/test/tuple/tuple.cpp
index aa5c890f6..f8ce6daa1 100644
--- a/test/tuple/tuple.cpp
+++ b/test/tuple/tuple.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/tuple/tuple.hpp>
+#include <boost/hana/tuple.hpp>
 
 #include <utility>
 using namespace boost::hana;
@@ -17,7 +17,9 @@ struct movable {
 };
 
 int main() {
-#if 0 // disabled until c++17; see tuple/tuple.hpp for details
+    // disabled until c++17; see the comment on the definition of hana::tuple
+    // for details
+#if 0
     // movable only
     {
         auto x = tuple(movable{});
diff --git a/test/type/comparable.cpp b/test/type/comparable.cpp
index f89157ec1..8b940c707 100644
--- a/test/type/comparable.cpp
+++ b/test/type/comparable.cpp
@@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/hana/type/comparable.hpp>
+#include <boost/hana/type.hpp>
 
 #include <boost/hana/detail/assert.hpp>