diff --git a/.mp-units.imp b/.mp-units.imp
index 27b7864d..ce096a5a 100644
--- a/.mp-units.imp
+++ b/.mp-units.imp
@@ -1,7 +1,10 @@
 [
-  { include: ["<functional>", "public", "<algorithm>", "public"] },
-  { include: ["<string>", "public", "<fmt/format.h>", "public"] },
-  { include: ["<memory>", "public", "<catch2/catch.hpp>", "public"] },
-  { include: ["<initializer_list>", "public", "<linear_algebra.hpp>", "public"] },
-  { symbol: ["abs", "private", "<cmath>", public]}
+  { include: ["<bits/chrono.h>", "private", "<chrono>", "public"] },
+  { symbol: ["std::string_view", "private", "<string_view>", public]},
+  { symbol: ["std::char_traits", "private", "<string_view>", public]},
+  { symbol: ["std::abs", "private", "<cmath>", public]},
+  { symbol: ["std::locale", "private", "<locale>", public]},
+  { symbol: ["std::numpunct", "private", "<locale>", public]},
+  { symbol: ["std::ostream", "private", "<ostream>", public]},
+  { symbol: ["std::ostringstream", "private", "<sstream>", public]}
 ]
diff --git a/example/clcpp_response.cpp b/example/clcpp_response.cpp
index e7dba32a..dbdca1e3 100644
--- a/example/clcpp_response.cpp
+++ b/example/clcpp_response.cpp
@@ -24,7 +24,7 @@ import mp_units;
 #include <mp-units/ostream.h>
 #include <mp-units/systems/iau.h>
 #include <mp-units/systems/imperial.h>
-#include <mp-units/systems/international.h>
+#include <mp-units/systems/international.h>  // IWYU pragma: keep
 #include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/si.h>
 #include <mp-units/systems/typographic.h>
diff --git a/example/foot_pound_second.cpp b/example/foot_pound_second.cpp
index 37786a2d..f62804f5 100644
--- a/example/foot_pound_second.cpp
+++ b/example/foot_pound_second.cpp
@@ -22,16 +22,17 @@
 
 #include <mp-units/compat_macros.h>
 #include <iostream>
+#include <string>
 #include <string_view>
 #ifdef MP_UNITS_MODULES
 import mp_units;
 #else
 #include <mp-units/format.h>
 #include <mp-units/systems/imperial.h>
-#include <mp-units/systems/international.h>
+#include <mp-units/systems/international.h>  // IWYU pragma: keep
 #include <mp-units/systems/isq/mechanics.h>
 #include <mp-units/systems/isq/space_and_time.h>
-#include <mp-units/systems/si/unit_symbols.h>
+#include <mp-units/systems/si.h>
 #endif
 
 using namespace mp_units;
diff --git a/example/glide_computer.cpp b/example/glide_computer.cpp
index bf2a4435..eb7b26be 100644
--- a/example/glide_computer.cpp
+++ b/example/glide_computer.cpp
@@ -20,19 +20,21 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#include "geographic.h"
 #include "glide_computer_lib.h"
+#include <mp-units/bits/hacks.h>
 #include <mp-units/compat_macros.h>
 #include <array>
+#include <chrono>
+#include <concepts>
 #include <exception>
 #include <iostream>
-#include <iterator>
+#include <ranges>
 #include <string>
 #include <utility>
-#include <vector>
 #ifdef MP_UNITS_MODULES
 import mp_units;
 #else
-#include <mp-units/math.h>
 #include <mp-units/systems/international.h>
 #include <mp-units/systems/si.h>
 #endif
diff --git a/example/glide_computer_lib/glide_computer_lib.cpp b/example/glide_computer_lib/glide_computer_lib.cpp
index f82d0d4c..7c144939 100644
--- a/example/glide_computer_lib/glide_computer_lib.cpp
+++ b/example/glide_computer_lib/glide_computer_lib.cpp
@@ -21,6 +21,7 @@
 // SOFTWARE.
 
 #include "glide_computer_lib.h"
+#include <functional>
 #include <iostream>
 #include <numeric>
 #include <string_view>
diff --git a/example/glide_computer_lib/include/glide_computer_lib.h b/example/glide_computer_lib/include/glide_computer_lib.h
index 5a1faaf7..bb04a7b3 100644
--- a/example/glide_computer_lib/include/glide_computer_lib.h
+++ b/example/glide_computer_lib/include/glide_computer_lib.h
@@ -27,19 +27,20 @@
 #include "geographic.h"
 #include <algorithm>
 #include <array>
+#include <chrono>
+#include <concepts>
+#include <cstddef>
 #include <initializer_list>
 #include <iterator>
-#include <ostream>
 #include <ranges>
 #include <string>  // IWYU pragma: keep
 #include <vector>
 #ifdef MP_UNITS_MODULES
 import mp_units;
 #else
-#include <mp-units/framework/quantity_point.h>
 #include <mp-units/math.h>  // IWYU pragma: keep
 #include <mp-units/systems/isq/space_and_time.h>
-#include <mp-units/systems/si/chrono.h>
+#include <mp-units/systems/si.h>
 #endif
 
 // An example of a really simplified tactical glide computer
diff --git a/example/measurement.cpp b/example/measurement.cpp
index 1e9618aa..1609c158 100644
--- a/example/measurement.cpp
+++ b/example/measurement.cpp
@@ -24,7 +24,6 @@
 #include <mp-units/compat_macros.h>
 #include <cmath>
 #include <compare>  // IWYU pragma: export
-#include <cstdlib>
 #include <exception>
 #include <iostream>
 #include <utility>
diff --git a/example/unmanned_aerial_vehicle.cpp b/example/unmanned_aerial_vehicle.cpp
index e16a7877..e8976e93 100644
--- a/example/unmanned_aerial_vehicle.cpp
+++ b/example/unmanned_aerial_vehicle.cpp
@@ -21,14 +21,14 @@
 // SOFTWARE.
 
 #include "geographic.h"
+#include "ranged_representation.h"
 #include <mp-units/compat_macros.h>
 #include <cassert>
 #include <iostream>
+#include <string>
 #ifdef MP_UNITS_MODULES
 import mp_units;
 #else
-#include <mp-units/framework/quantity_point.h>
-#include <mp-units/ostream.h>
 #include <mp-units/systems/international.h>
 #include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/si.h>
diff --git a/src/core/include/mp-units/compat_macros.h b/src/core/include/mp-units/compat_macros.h
index b9897338..e1d0c114 100644
--- a/src/core/include/mp-units/compat_macros.h
+++ b/src/core/include/mp-units/compat_macros.h
@@ -90,6 +90,7 @@
 
 #ifndef MP_UNITS_IN_MODULE_INTERFACE
 
+// IWYU pragma: begin_exports
 #if MP_UNITS_USE_FMTLIB
 MP_UNITS_DIAGNOSTIC_PUSH
 MP_UNITS_DIAGNOSTIC_IGNORE_UNREACHABLE
@@ -99,5 +100,6 @@ MP_UNITS_DIAGNOSTIC_POP
 #else
 #include <format>
 #endif
+// IWYU pragma: end_exports
 
 #endif
diff --git a/test/runtime/fmt_test.cpp b/test/runtime/fmt_test.cpp
index 3808905f..13f7e461 100644
--- a/test/runtime/fmt_test.cpp
+++ b/test/runtime/fmt_test.cpp
@@ -21,17 +21,21 @@
 // SOFTWARE.
 
 #include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
 #include <catch2/matchers/catch_matchers_exception.hpp>
 #include <mp-units/compat_macros.h>
 #include <cstdint>
 #include <iomanip>
 #include <limits>
 #include <locale>
+#include <sstream>
+#include <string>
+#include <string_view>
 #ifdef MP_UNITS_MODULES
 import mp_units;
 #else
+#include <mp-units/ext/fixed_string.h>
 #include <mp-units/format.h>
-#include <mp-units/framework/customization_points.h>
 #include <mp-units/ostream.h>  // IWYU pragma: keep
 #include <mp-units/systems/cgs.h>
 #include <mp-units/systems/isq/electromagnetism.h>
diff --git a/test/static/fractional_exponent_quantity.cpp b/test/static/fractional_exponent_quantity.cpp
index aca6f206..349582a4 100644
--- a/test/static/fractional_exponent_quantity.cpp
+++ b/test/static/fractional_exponent_quantity.cpp
@@ -22,7 +22,7 @@
 
 #include <mp-units/compat_macros.h>
 #include <mp-units/framework.h>
-#include <mp-units/math.h>
+#include <mp-units/math.h>  // IWYU pragma: keep
 #include <mp-units/systems/isq/electromagnetism.h>
 #include <mp-units/systems/isq/si_quantities.h>
 #include <mp-units/systems/si/units.h>
diff --git a/test/static/international_test.cpp b/test/static/international_test.cpp
index b2f5b402..8dc41168 100644
--- a/test/static/international_test.cpp
+++ b/test/static/international_test.cpp
@@ -20,7 +20,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include <mp-units/math.h>
 #include <mp-units/systems/international.h>
 #include <mp-units/systems/isq/mechanics.h>
 #include <mp-units/systems/isq/space_and_time.h>
diff --git a/test/static/natural_test.cpp b/test/static/natural_test.cpp
index 7822cfd3..84e61e9e 100644
--- a/test/static/natural_test.cpp
+++ b/test/static/natural_test.cpp
@@ -20,9 +20,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include <mp-units/math.h>
-#include <mp-units/systems/isq/mechanics.h>
-#include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/natural.h>
 
 template<class T>
diff --git a/test/static/si_test.cpp b/test/static/si_test.cpp
index e961774a..71a14c61 100644
--- a/test/static/si_test.cpp
+++ b/test/static/si_test.cpp
@@ -20,7 +20,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include <mp-units/math.h>
 #include <mp-units/systems/si.h>
 #include <type_traits>