diff --git a/include/fmt/std.h b/include/fmt/std.h
index 696662ae61cb..cd908dc99e17 100644
--- a/include/fmt/std.h
+++ b/include/fmt/std.h
@@ -35,9 +35,11 @@
 #    if FMT_HAS_INCLUDE(<optional>)
 #      include <optional>
 #    endif
-#    if FMT_HAS_INCLUDE(<source_location>)
-#      include <source_location>
-#    endif
+#  endif
+// Use > instead of >= in the version check because <source_location> may be
+// available after C++17 but before C++20 is marked as implemented.
+#  if FMT_CPLUSPLUS > 201703L && FMT_HAS_INCLUDE(<source_location>)
+#    include <source_location>
 #  endif
 #  if FMT_CPLUSPLUS > 202002L && FMT_HAS_INCLUDE(<expected>)
 #    include <expected>
diff --git a/test/ranges-test.cc b/test/ranges-test.cc
index 33ac5e38872a..ab94209fa436 100644
--- a/test/ranges-test.cc
+++ b/test/ranges-test.cc
@@ -17,7 +17,7 @@
 #include <utility>
 #include <vector>
 
-#if FMT_HAS_INCLUDE(<ranges>)
+#if FMT_CPLUSPLUS > 201703L && FMT_HAS_INCLUDE(<ranges>)
 #  include <ranges>
 #endif