diff --git a/include/fmt/format.h b/include/fmt/format.h
index abdd2ada..5333eb51 100644
--- a/include/fmt/format.h
+++ b/include/fmt/format.h
@@ -41,10 +41,11 @@
 #include "base.h"
 
 #ifndef FMT_MODULE
+#  include <stdlib.h>  // malloc, free
+
 #  include <cmath>    // std::signbit
 #  include <cstddef>  // std::byte
 #  include <cstdint>  // uint32_t
-#  include <cstdlib>  // std::malloc, std::free
 #  include <cstring>  // std::memcpy
 #  include <limits>   // std::numeric_limits
 #  include <new>      // std::bad_alloc
@@ -744,12 +745,12 @@ template <typename T> struct allocator : private std::decay<void> {
 
   auto allocate(size_t n) -> T* {
     FMT_ASSERT(n <= max_value<size_t>() / sizeof(T), "");
-    T* p = static_cast<T*>(std::malloc(n * sizeof(T)));
+    T* p = static_cast<T*>(malloc(n * sizeof(T)));
     if (!p) FMT_THROW(std::bad_alloc());
     return p;
   }
 
-  void deallocate(T* p, size_t) { std::free(p); }
+  void deallocate(T* p, size_t) { free(p); }
 
   constexpr friend auto operator==(allocator, allocator) noexcept -> bool {
     return true;  // All instances of this allocator are equivalent.
diff --git a/include/fmt/std.h b/include/fmt/std.h
index 0cc0066e..1127feaa 100644
--- a/include/fmt/std.h
+++ b/include/fmt/std.h
@@ -139,8 +139,8 @@ template <typename Variant, typename Char> class is_variant_formattable {
 #endif  // FMT_CPP_LIB_VARIANT
 
 #if FMT_USE_RTTI
-inline string_view normalize_libcxx_inline_namespaces(
-    string_view demangled_name_view, char* begin) {
+inline auto normalize_libcxx_inline_namespaces(string_view demangled_name_view,
+                                               char* begin) -> string_view {
   // Normalization of stdlib inline namespace names.
   // libc++ inline namespaces.
   //  std::__1::*       -> std::*
@@ -198,7 +198,7 @@ auto write_demangled_name(OutputIt out, const std::type_info& ti) -> OutputIt {
   int status = 0;
   size_t size = 0;
   std::unique_ptr<char, void (*)(void*)> demangled_name_ptr(
-      abi::__cxa_demangle(ti.name(), nullptr, &size, &status), &std::free);
+      abi::__cxa_demangle(ti.name(), nullptr, &size, &status), &free);
 
   string_view demangled_name_view;
   if (demangled_name_ptr) {
@@ -211,7 +211,7 @@ auto write_demangled_name(OutputIt out, const std::type_info& ti) -> OutputIt {
 #  elif FMT_MSC_VERSION && defined(_MSVC_STL_UPDATE)
   return normalize_msvc_abi_name(ti.name(), out);
 #  elif FMT_MSC_VERSION && defined(_LIBCPP_VERSION)
-  const string_view demangled_name(ti.name());
+  const string_view demangled_name = ti.name();
   std::string name_copy(demangled_name.size(), '\0');
   // normalize_msvc_abi_name removes class, struct, union etc that MSVC has in
   // front of types