diff --git a/sprout/adl/not_found.hpp b/sprout/adl/not_found.hpp
index c33e23d5..46dcb238 100644
--- a/sprout/adl/not_found.hpp
+++ b/sprout/adl/not_found.hpp
@@ -17,6 +17,18 @@ namespace sprout {
 	struct is_not_found_via_adl
 		: public std::is_same<T, sprout::not_found_via_adl>
 	{};
+	template<typename T>
+	struct is_not_found_via_adl<T const>
+		: public sprout::is_not_found_via_adl<T>
+	{};
+	template<typename T>
+	struct is_not_found_via_adl<T volatile>
+		: public sprout::is_not_found_via_adl<T>
+	{};
+	template<typename T>
+	struct is_not_found_via_adl<T const volatile>
+		: public sprout::is_not_found_via_adl<T>
+	{};
 
 	//
 	// is_found_via_adl
diff --git a/sprout/tpp/algorithm.hpp b/sprout/tpp/algorithm.hpp
index 12ab7326..7ec63b78 100644
--- a/sprout/tpp/algorithm.hpp
+++ b/sprout/tpp/algorithm.hpp
@@ -1,95 +1,9 @@
 #ifndef SPROUT_TPP_ALGORITHM_HPP
 #define SPROUT_TPP_ALGORITHM_HPP
 
-#include <type_traits>
 #include <sprout/config.hpp>
-
-namespace sprout {
-	namespace tpp {
-		namespace detail {
-			template<bool Head, bool... Tail>
-			struct all_of_impl;
-			template<>
-			struct all_of_impl<true>
-				: public std::true_type
-			{};
-			template<>
-			struct all_of_impl<false>
-				: public std::false_type
-			{};
-			template<bool... Tail>
-			struct all_of_impl<true, Tail...>
-				: public std::integral_constant<bool, sprout::tpp::detail::all_of_impl<Tail...>::value>
-			{};
-			template<bool... Tail>
-			struct all_of_impl<false, Tail...>
-				: public std::false_type
-			{};
-		}	// namespace detail
-		//
-		// all_of
-		//
-		template<bool... Values>
-		struct all_of
-			: public sprout::tpp::detail::all_of_impl<Values...>
-		{};
-
-		namespace detail {
-			template<bool Head, bool... Tail>
-			struct any_of_impl;
-			template<>
-			struct any_of_impl<true>
-				: public std::true_type
-			{};
-			template<>
-			struct any_of_impl<false>
-				: public std::false_type
-			{};
-			template<bool... Tail>
-			struct any_of_impl<true, Tail...>
-				: public std::true_type
-			{};
-			template<bool... Tail>
-			struct any_of_impl<false, Tail...>
-				: public std::integral_constant<bool, sprout::tpp::detail::any_of_impl<Tail...>::value>
-			{};
-		}	// namespace detail
-		//
-		// any_of
-		//
-		template<bool... Values>
-		struct any_of
-			: public sprout::tpp::detail::any_of_impl<Values...>
-		{};
-
-		namespace detail {
-			template<bool Head, bool... Tail>
-			struct none_of_impl;
-			template<>
-			struct none_of_impl<true>
-				: public std::false_type
-			{};
-			template<>
-			struct none_of_impl<false>
-				: public std::true_type
-			{};
-			template<bool... Tail>
-			struct none_of_impl<true, Tail...>
-				: public std::false_type
-			{};
-			template<bool... Tail>
-			struct none_of_impl<false, Tail...>
-				: public std::integral_constant<bool, sprout::tpp::detail::none_of_impl<Tail...>::value>
-			{};
-		}	// namespace detail
-		//
-		// none_of
-		//
-		template<bool... Values>
-		struct none_of
-			: public sprout::tpp::detail::none_of_impl<Values...>
-		{};
-	}	// namespace tpp
-}	// namespace sprout
+#include <sprout/tpp/algorithm/all_of.hpp>
+#include <sprout/tpp/algorithm/any_of.hpp>
+#include <sprout/tpp/algorithm/none_of.hpp>
 
 #endif	// #ifndef SPROUT_TPP_ALGORITHM_HPP
diff --git a/sprout/tpp/algorithm/all_of.hpp b/sprout/tpp/algorithm/all_of.hpp
new file mode 100644
index 00000000..79a9d258
--- /dev/null
+++ b/sprout/tpp/algorithm/all_of.hpp
@@ -0,0 +1,39 @@
+#ifndef SPROUT_TPP_ALGORITHM_ALL_OF_HPP
+#define SPROUT_TPP_ALGORITHM_ALL_OF_HPP
+
+#include <type_traits>
+#include <sprout/config.hpp>
+
+namespace sprout {
+	namespace tpp {
+		namespace detail {
+			template<bool Head, bool... Tail>
+			struct all_of_impl;
+			template<>
+			struct all_of_impl<true>
+				: public std::true_type
+			{};
+			template<>
+			struct all_of_impl<false>
+				: public std::false_type
+			{};
+			template<bool... Tail>
+			struct all_of_impl<true, Tail...>
+				: public std::integral_constant<bool, sprout::tpp::detail::all_of_impl<Tail...>::value>
+			{};
+			template<bool... Tail>
+			struct all_of_impl<false, Tail...>
+				: public std::false_type
+			{};
+		}	// namespace detail
+		//
+		// all_of
+		//
+		template<bool... Values>
+		struct all_of
+			: public sprout::tpp::detail::all_of_impl<Values...>
+		{};
+	}	// namespace tpp
+}	// namespace sprout
+
+#endif	// #ifndef SPROUT_TPP_ALGORITHM_ALL_OF_HPP
diff --git a/sprout/tpp/algorithm/any_of.hpp b/sprout/tpp/algorithm/any_of.hpp
new file mode 100644
index 00000000..2ededd43
--- /dev/null
+++ b/sprout/tpp/algorithm/any_of.hpp
@@ -0,0 +1,39 @@
+#ifndef SPROUT_TPP_ALGORITHM_ANY_OF_HPP
+#define SPROUT_TPP_ALGORITHM_ANY_OF_HPP
+
+#include <type_traits>
+#include <sprout/config.hpp>
+
+namespace sprout {
+	namespace tpp {
+		namespace detail {
+			template<bool Head, bool... Tail>
+			struct any_of_impl;
+			template<>
+			struct any_of_impl<true>
+				: public std::true_type
+			{};
+			template<>
+			struct any_of_impl<false>
+				: public std::false_type
+			{};
+			template<bool... Tail>
+			struct any_of_impl<true, Tail...>
+				: public std::true_type
+			{};
+			template<bool... Tail>
+			struct any_of_impl<false, Tail...>
+				: public std::integral_constant<bool, sprout::tpp::detail::any_of_impl<Tail...>::value>
+			{};
+		}	// namespace detail
+		//
+		// any_of
+		//
+		template<bool... Values>
+		struct any_of
+			: public sprout::tpp::detail::any_of_impl<Values...>
+		{};
+	}	// namespace tpp
+}	// namespace sprout
+
+#endif	// #ifndef SPROUT_TPP_ALGORITHM_ANY_OF_HPP
diff --git a/sprout/tpp/algorithm/none_of.hpp b/sprout/tpp/algorithm/none_of.hpp
new file mode 100644
index 00000000..bcf63bcd
--- /dev/null
+++ b/sprout/tpp/algorithm/none_of.hpp
@@ -0,0 +1,39 @@
+#ifndef SPROUT_TPP_ALGORITHM_NONE_OF_HPP
+#define SPROUT_TPP_ALGORITHM_NONE_OF_HPP
+
+#include <type_traits>
+#include <sprout/config.hpp>
+
+namespace sprout {
+	namespace tpp {
+		namespace detail {
+			template<bool Head, bool... Tail>
+			struct none_of_impl;
+			template<>
+			struct none_of_impl<true>
+				: public std::false_type
+			{};
+			template<>
+			struct none_of_impl<false>
+				: public std::true_type
+			{};
+			template<bool... Tail>
+			struct none_of_impl<true, Tail...>
+				: public std::false_type
+			{};
+			template<bool... Tail>
+			struct none_of_impl<false, Tail...>
+				: public std::integral_constant<bool, sprout::tpp::detail::none_of_impl<Tail...>::value>
+			{};
+		}	// namespace detail
+		//
+		// none_of
+		//
+		template<bool... Values>
+		struct none_of
+			: public sprout::tpp::detail::none_of_impl<Values...>
+		{};
+	}	// namespace tpp
+}	// namespace sprout
+
+#endif	// #ifndef SPROUT_TPP_ALGORITHM_NONE_OF_HPP