diff --git a/include/fmt/std.h b/include/fmt/std.h
index fff6da9dd04e..9b3709f53224 100644
--- a/include/fmt/std.h
+++ b/include/fmt/std.h
@@ -225,7 +225,7 @@ template <typename T> struct is_bit_reference_like {
 
 // Workaround for libc++ incompatibility with C++ standard.
 // According to the Standard, `bitset::operator[] const` returns bool.
-#ifdef _LIBCPP_VERSION
+#if defined(_LIBCPP_VERSION) && !defined(FMT_IMPORT_STD)
 template <typename C>
 struct is_bit_reference_like<std::__bit_const_reference<C>> {
   static constexpr bool value = true;
diff --git a/src/fmt.cc b/src/fmt.cc
index 671fd69589eb..0713da75c393 100644
--- a/src/fmt.cc
+++ b/src/fmt.cc
@@ -50,6 +50,8 @@ module;
 #  include <limits.h>
 #  include <stdint.h>
 #  include <stdio.h>
+#  include <stdlib.h>
+#  include <string.h>
 #  include <time.h>
 #endif
 #include <cerrno>