diff --git a/include/fmt/printf.h b/include/fmt/printf.h
index ee4b06fd5e72..072cc6b309d4 100644
--- a/include/fmt/printf.h
+++ b/include/fmt/printf.h
@@ -569,8 +569,8 @@ using wprintf_args = basic_format_args<wprintf_context>;
 /// arguments and can be implicitly converted to `printf_args`.
 template <typename Char = char, typename... T>
 inline auto make_printf_args(T&... args)
-    -> decltype(make_format_args<basic_printf_context<Char>>(args...)) {
-  return make_format_args<basic_printf_context<Char>>(args...);
+    -> decltype(fmt::make_format_args<basic_printf_context<Char>>(args...)) {
+  return fmt::make_format_args<basic_printf_context<Char>>(args...);
 }
 
 template <typename Char> struct vprintf_args {
diff --git a/test/printf-test.cc b/test/printf-test.cc
index d3f03b7f3855..ee5cf0b0e0a1 100644
--- a/test/printf-test.cc
+++ b/test/printf-test.cc
@@ -6,6 +6,10 @@
 // For the license information refer to format.h.
 
 #include "fmt/printf.h"
+// include <format> if possible for https://github.com/fmtlib/fmt/pull/4042
+#if FMT_HAS_INCLUDE(<format>) && FMT_CPLUSPLUS > 201703L
+#  include <format>
+#endif
 
 #include <cctype>
 #include <climits>