diff --git a/include/boost/uuid/detail/cstring.hpp b/include/boost/uuid/detail/cstring.hpp
index 5c69805..5f3feca 100644
--- a/include/boost/uuid/detail/cstring.hpp
+++ b/include/boost/uuid/detail/cstring.hpp
@@ -8,6 +8,7 @@
 #include <boost/uuid/detail/is_constant_evaluated.hpp>
 #include <boost/config.hpp>
 #include <cstddef>
+#include <cstring>
 
 #if defined(__has_builtin)
 #if __has_builtin(__builtin_memcpy)
@@ -33,10 +34,6 @@
 #define BOOST_UUID_DETAIL_MEMCMP std::memcmp
 #endif
 
-#if !defined(BOOST_UUID_DETAIL_HAS_BUILTIN_MEMCPY) || !defined(BOOST_UUID_DETAIL_HAS_BUILTIN_MEMCMP)
-#include <cstring>
-#endif
-
 namespace boost {
 namespace uuids {
 namespace detail {
diff --git a/include/boost/uuid/detail/from_chars.hpp b/include/boost/uuid/detail/from_chars.hpp
index 09dab9b..eaf51dd 100644
--- a/include/boost/uuid/detail/from_chars.hpp
+++ b/include/boost/uuid/detail/from_chars.hpp
@@ -5,11 +5,11 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 
+#include <boost/uuid/detail/from_chars_generic.hpp>
+#include <boost/uuid/detail/from_chars_result.hpp>
 #include <boost/uuid/uuid.hpp>
 #include <boost/uuid/detail/config.hpp>
 #include <boost/uuid/detail/is_constant_evaluated.hpp>
-#include <boost/uuid/detail/from_chars_result.hpp>
-#include <boost/uuid/detail/from_chars_generic.hpp>
 #if defined(BOOST_UUID_USE_SSE41)
 #include <boost/uuid/detail/from_chars_x86.hpp>
 #endif
diff --git a/include/boost/uuid/detail/from_chars_generic.hpp b/include/boost/uuid/detail/from_chars_generic.hpp
index 58a9617..84b89fc 100644
--- a/include/boost/uuid/detail/from_chars_generic.hpp
+++ b/include/boost/uuid/detail/from_chars_generic.hpp
@@ -5,10 +5,10 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 
-#include <cstddef>
-#include <boost/uuid/uuid.hpp>
 #include <boost/uuid/detail/from_chars_result.hpp>
+#include <boost/uuid/uuid.hpp>
 #include <boost/config.hpp>
+#include <cstddef>
 
 #if defined(BOOST_UUID_REPORT_IMPLEMENTATION)