diff --git a/.clang-format b/.clang-format
index f202a07c..6547d167 100644
--- a/.clang-format
+++ b/.clang-format
@@ -86,8 +86,12 @@ IncludeBlocks:   Regroup
 IncludeCategories:
   - Regex:           '(<gtest/.*|<benchmark/.*)'
     Priority:        1
+  - Regex:           '(<sharg/std/charconv>)'
+    Priority:        2
+    SortPriority:    1
   - Regex:           '(<[[:alnum:]._]+>|<sharg/std/.*>)'
     Priority:        2
+    SortPriority:    2
   - Regex:           '<sdsl/'
     Priority:        3
   - Regex:           '<sharg/'
diff --git a/include/sharg/std/charconv b/include/sharg/std/charconv
index 7b8571f1..63b79703 100644
--- a/include/sharg/std/charconv
+++ b/include/sharg/std/charconv
@@ -11,9 +11,24 @@
 #ifndef SEQAN_STD_CHARCONV_SHIM // to avoid multiple definitions if other seqan modules also implement this
 #define SEQAN_STD_CHARCONV_SHIM
 
+#include <version> // From C++20 onwards, all feature macros should be defined here.
+
+// Workaround for llvm marking float charconv as unavailable
+#if defined(__APPLE__) && defined(_LIBCPP_VERSION)
+#    ifdef _LIBCPP___CHARCONV_FROM_CHARS_FLOATING_POINT_H
+#        warning This file needs to be included before any <charconv> include.
+#    endif
+#    if __has_include(<__configuration/availability.h>)
+#        include <__configuration/availability.h>
+#        undef _LIBCPP_AVAILABILITY_FROM_CHARS_FLOATING_POINT
+#        define _LIBCPP_AVAILABILITY_FROM_CHARS_FLOATING_POINT /* nothing */
+#        undef _LIBCPP_AVAILABILITY_HAS_FROM_CHARS_FLOATING_POINT
+#        define _LIBCPP_AVAILABILITY_HAS_FROM_CHARS_FLOATING_POINT /* nothing */
+#    endif
+#endif
+
 #include <charconv>
 #include <utility> // __cpp_lib_to_chars may be defined here as currently documented.
-#include <version> // From C++20 onwards, all feature macros should be defined here.
 
 /*!\defgroup std std
  * \ingroup misc
diff --git a/test/unit/std/charconv_float_test.cpp b/test/unit/std/charconv_float_test.cpp
index 6addf21c..fd99256e 100644
--- a/test/unit/std/charconv_float_test.cpp
+++ b/test/unit/std/charconv_float_test.cpp
@@ -4,15 +4,13 @@
 
 #include <gtest/gtest.h>
 
-#if __has_include(<charconv>)
 // make sure that including the std header does not produce any errors
 // see https://github.com/seqan/seqan3/issues/2352
-#    include <charconv>
-#endif // __has_include(<charconv>)
+#include <sharg/std/charconv>
+#include <charconv>
 #include <cmath>
 #include <iostream>
 #include <limits>
-#include <sharg/std/charconv>
 
 // =============================================================================
 // std::from_chars for float, double and long double
diff --git a/test/unit/std/charconv_int_test.cpp b/test/unit/std/charconv_int_test.cpp
index 6cb632ed..186d347f 100644
--- a/test/unit/std/charconv_int_test.cpp
+++ b/test/unit/std/charconv_int_test.cpp
@@ -4,15 +4,13 @@
 
 #include <gtest/gtest.h>
 
-#if __has_include(<charconv>)
 // make sure that including the std header does not produce any errors
 // see https://github.com/seqan/seqan3/issues/2352
-#    include <charconv>
-#endif // __has_include(<charconv>)
+#include <sharg/std/charconv>
+#include <charconv>
 #include <cmath>
 #include <iostream>
 #include <limits>
-#include <sharg/std/charconv>
 
 // =============================================================================
 // std::from_chars for integral types