diff --git a/example/alternative_namespaces/units_str.h b/example/alternative_namespaces/units_str.h
index 44e9883f..76809c29 100644
--- a/example/alternative_namespaces/units_str.h
+++ b/example/alternative_namespaces/units_str.h
@@ -1,7 +1,9 @@
 #pragma once
 
+#include <units/bits/unit_text.h>
 #include <units/isq/si/prefixes.h>
 #include <units/quantity.h>
+
 // get at the units text of the quantity, without its numeric value
 inline auto constexpr units_str(const units::Quantity auto& q)
 {
diff --git a/src/core-fmt/include/units/format.h b/src/core-fmt/include/units/format.h
index fffe12d4..cbebd3d1 100644
--- a/src/core-fmt/include/units/format.h
+++ b/src/core-fmt/include/units/format.h
@@ -26,14 +26,16 @@
 #include <units/quantity.h>
 #include <string_view>
 
+// IWYU pragma: begin_exports
+#include <units/bits/unit_text.h>
+
 UNITS_DIAGNOSTIC_PUSH
 UNITS_DIAGNOSTIC_IGNORE_UNREACHABLE
 UNITS_DIAGNOSTIC_IGNORE_SHADOW
-// IWYU pragma: begin_exports
 #include <fmt/format.h>
 #include <fmt/locale.h>
-// IWYU pragma: end_exports
 UNITS_DIAGNOSTIC_POP
+// IWYU pragma: end_exports
 
 // Grammar
 // 
diff --git a/src/core-io/include/units/quantity_io.h b/src/core-io/include/units/quantity_io.h
index 78b2522b..3a502982 100644
--- a/src/core-io/include/units/quantity_io.h
+++ b/src/core-io/include/units/quantity_io.h
@@ -27,6 +27,7 @@
 
 // IWYU pragma: begin_exports
 #include <units/bits/external/fixed_string_io.h>
+#include <units/bits/unit_text.h>
 #include <sstream>
 // IWYU pragma: end_exports
 
diff --git a/src/core/include/units/quantity.h b/src/core/include/units/quantity.h
index fc79893f..684eb614 100644
--- a/src/core/include/units/quantity.h
+++ b/src/core/include/units/quantity.h
@@ -27,7 +27,6 @@
 #include <units/generic/dimensionless.h>
 
 // IWYU pragma: begin_exports
-#include <units/bits/unit_text.h>
 #include <units/quantity_cast.h>
 #include <units/ratio.h>
 #include <compare>
diff --git a/test/unit_test/static/cgs_test.cpp b/test/unit_test/static/cgs_test.cpp
index 5a268fb5..99549ad9 100644
--- a/test/unit_test/static/cgs_test.cpp
+++ b/test/unit_test/static/cgs_test.cpp
@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#include <units/bits/unit_text.h>
 #include <units/concepts.h>
 #include <units/isq/si/cgs/cgs.h>
 #include <units/unit.h>
diff --git a/test/unit_test/static/fps_test.cpp b/test/unit_test/static/fps_test.cpp
index 5581f1df..054e2a5e 100644
--- a/test/unit_test/static/fps_test.cpp
+++ b/test/unit_test/static/fps_test.cpp
@@ -20,9 +20,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include <units/isq/si/fps/fps.h>
 #include <units/bits/basic_concepts.h>
+#include <units/bits/unit_text.h>
 #include <units/isq/si/acceleration.h>
+#include <units/isq/si/fps/fps.h>
 #include <units/isq/si/time.h>
 
 namespace {
diff --git a/test/unit_test/static/si_test.cpp b/test/unit_test/static/si_test.cpp
index e57bc1f1..29b27fa7 100644
--- a/test/unit_test/static/si_test.cpp
+++ b/test/unit_test/static/si_test.cpp
@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#include <units/bits/unit_text.h>
 #include <units/generic/angle.h>
 #include <units/generic/dimensionless.h>
 #include <units/isq/si/si.h>