diff --git a/libs/cstring/test/memchr.cpp b/libs/cstring/test/memchr.cpp
index 71d3b19e..945ad1dd 100644
--- a/libs/cstring/test/memchr.cpp
+++ b/libs/cstring/test/memchr.cpp
@@ -2,7 +2,6 @@
 #define SPROUT_LIBS_CSTRING_TEST_MEMCHR_CPP
 
 #include <sprout/cstring/memchr.hpp>
-#include <sprout/iterator.hpp>
 #include <testspr/tools.hpp>
 
 namespace testspr {
@@ -15,7 +14,6 @@ namespace testspr {
 			{
 				SPROUT_STATIC_CONSTEXPR auto found = sprout::memchr(buf, b, 12);
 				TESTSPR_BOTH_ASSERT(buf + 8 == found);
-//				TESTSPR_BOTH_ASSERT(sprout::distance(buf, reinterpret_cast<unsigned char const*>(found)) == 8);
 			}
 		}
 	}
diff --git a/sprout/cstring/memchr.hpp b/sprout/cstring/memchr.hpp
index e0375674..e93874eb 100644
--- a/sprout/cstring/memchr.hpp
+++ b/sprout/cstring/memchr.hpp
@@ -2,13 +2,12 @@
 #define SPROUT_CSTRING_MEMCHR_HPP
 
 #include <cstddef>
-#include <sprout/config.hpp>
-#include <sprout/iterator/ptr_index_iterator.hpp>
-#include <sprout/algorithm/find.hpp>
-
 #include <type_traits>
 #include <utility>
+#include <sprout/config.hpp>
 #include <sprout/type_traits/enabler_if.hpp>
+#include <sprout/iterator/ptr_index_iterator.hpp>
+#include <sprout/algorithm/find.hpp>
 
 namespace sprout {
 	namespace detail {
diff --git a/sprout/cstring/memcmp.hpp b/sprout/cstring/memcmp.hpp
index 1f15d911..e55fb246 100644
--- a/sprout/cstring/memcmp.hpp
+++ b/sprout/cstring/memcmp.hpp
@@ -2,13 +2,12 @@
 #define SPROUT_CSTRING_MEMCMP_HPP
 
 #include <cstddef>
+#include <type_traits>
 #include <sprout/config.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
 #include <sprout/iterator/ptr_index_iterator.hpp>
 #include <sprout/algorithm/tristate_lexicographical_compare.hpp>
 
-#include <type_traits>
-#include <sprout/type_traits/enabler_if.hpp>
-
 namespace sprout {
 	// 7.21.4.1 memcmp �֐�
 	//