diff --git a/example/kalman_filter/kalman_filter-example_2.cpp b/example/kalman_filter/kalman_filter-example_2.cpp
index f1fffedd..a291813f 100644
--- a/example/kalman_filter/kalman_filter-example_2.cpp
+++ b/example/kalman_filter/kalman_filter-example_2.cpp
@@ -21,9 +21,9 @@
 // SOFTWARE.
 
 #include "kalman.h"
+#include <mp-units/ext/format.h>
 #include <array>
 #include <iostream>
-#include <mp-units/ext/format.h>
 #ifdef MP_UNITS_MODULES
 import mp_units;
 #else
diff --git a/example/kalman_filter/kalman_filter-example_6.cpp b/example/kalman_filter/kalman_filter-example_6.cpp
index 7e17b23c..2dc55ba1 100644
--- a/example/kalman_filter/kalman_filter-example_6.cpp
+++ b/example/kalman_filter/kalman_filter-example_6.cpp
@@ -21,9 +21,9 @@
 // SOFTWARE.
 
 #include "kalman.h"
+#include <mp-units/ext/format.h>
 #include <array>
 #include <iostream>
-#include <mp-units/ext/format.h>
 #ifdef MP_UNITS_MODULES
 import mp_units;
 #else
diff --git a/src/core/include/mp-units/bits/fmt.h b/src/core/include/mp-units/bits/fmt.h
index 610be604..e48b39e7 100644
--- a/src/core/include/mp-units/bits/fmt.h
+++ b/src/core/include/mp-units/bits/fmt.h
@@ -35,13 +35,13 @@
 #include <mp-units/ext/algorithm.h>
 
 #ifndef MP_UNITS_IN_MODULE_INTERFACE
+#include <mp-units/ext/contracts.h>
+#include <mp-units/ext/format.h>
 #include <array>
 #include <concepts>
 #include <cstdint>
 #include <limits>
 #include <string_view>
-#include <mp-units/ext/contracts.h>
-#include <mp-units/ext/format.h>
 #endif
 
 // most of the below code is based on/copied from fmtlib
diff --git a/test/runtime/fixed_string_test.cpp b/test/runtime/fixed_string_test.cpp
index 621118cb..eaeebb66 100644
--- a/test/runtime/fixed_string_test.cpp
+++ b/test/runtime/fixed_string_test.cpp
@@ -23,9 +23,9 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/matchers/catch_matchers_exception.hpp>
 #include <mp-units/compat_macros.h>
+#include <mp-units/ext/format.h>
 #include <sstream>
 #include <string_view>
-#include <mp-units/ext/format.h>
 #ifdef MP_UNITS_MODULES
 import mp_units;
 #else
diff --git a/test/runtime/linear_algebra_test.cpp b/test/runtime/linear_algebra_test.cpp
index e55815fd..a63c53ac 100644
--- a/test/runtime/linear_algebra_test.cpp
+++ b/test/runtime/linear_algebra_test.cpp
@@ -22,9 +22,9 @@
 
 #include <catch2/catch_test_macros.hpp>
 #include <mp-units/compat_macros.h>
+#include <mp-units/ext/format.h>
 #include <matrix>
 #include <ostream>
-#include <mp-units/ext/format.h>
 #ifdef MP_UNITS_MODULES
 import mp_units;
 #else