diff --git a/include/boost/int128.hpp b/include/boost/int128.hpp
index b32becc4..7e5e45c4 100644
--- a/include/boost/int128.hpp
+++ b/include/boost/int128.hpp
@@ -15,8 +15,4 @@
 #include <boost/int128/climits.hpp>
 #include <boost/int128/cstdlib.hpp>
 
-#ifndef BOOST_INT128_BUILD_MODULE
-#include <boost/int128/fmt_format.hpp>
-#endif
-
 #endif // BOOST_INT128_HPP
diff --git a/include/boost/int128/fmt_format.hpp b/include/boost/int128/fmt_format.hpp
index 1edad574..8612efdb 100644
--- a/include/boost/int128/fmt_format.hpp
+++ b/include/boost/int128/fmt_format.hpp
@@ -12,11 +12,22 @@
 #include <boost/int128/int128.hpp>
 #include <cstring>
 #include <cstdlib>
-#include <fmt/base.h>
-#include <fmt/format.h>
 #include <algorithm>
 #include <tuple>
 
+#ifdef __GNUC__
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wconversion"
+#  pragma GCC diagnostic ignored "-Wsign-conversion"
+#endif
+
+#include <fmt/base.h>
+#include <fmt/format.h>
+
+#ifdef __GNUC__
+#  pragma GCC diagnostic pop
+#endif
+
 #define BOOST_INT128_HAS_FMT_FORMAT
 
 namespace boost {
diff --git a/include/boost/int128/format.hpp b/include/boost/int128/format.hpp
index c79141f3..ab6ff3f9 100644
--- a/include/boost/int128/format.hpp
+++ b/include/boost/int128/format.hpp
@@ -5,8 +5,7 @@
 #ifndef BOOST_INT128_FORMAT_HPP
 #define BOOST_INT128_FORMAT_HPP
 
-#if (__cplusplus >= 202002L || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L)) && \
-((defined(__GNUC__) && __GNUC__ >= 13) || (defined(__clang__) && __clang_major__ >= 18) || (defined(_MSC_VER) && _MSC_VER >= 1940))
+#if __has_include(<format>) && defined(__cpp_lib_format) && __cpp_lib_format >= 201907L && !defined(BOOST_DECIMAL_DISABLE_CLIB)
 
 #include <boost/int128/detail/mini_to_chars.hpp>
 #include <boost/int128/detail/config.hpp>