refactor: 💥 framework.h introduced + IWYU

example/avg_speed.cpp

@@ -33,8 +33,8 @@ import mp_units;
 #include <mp-units/ostream.h>
 #include <mp-units/systems/cgs/cgs.h>
 #include <mp-units/systems/international/international.h>
-#include <mp-units/systems/isq/space_and_time.h>
-#include <mp-units/systems/si/unit_symbols.h>
+#include <mp-units/systems/isq/isq.h>
+#include <mp-units/systems/si/si.h>
 #endif
 
 namespace {

example/capacitor_time_curve.cpp

@@ -24,7 +24,7 @@
 #ifdef MP_UNITS_MODULES
 import mp_units;
 #else
-#include <mp-units/math.h>  // IWYU pragma: keep
+#include <mp-units/math.h>
 #include <mp-units/ostream.h>
 #include <mp-units/systems/isq/electromagnetism.h>
 #include <mp-units/systems/si/si.h>

example/conversion_factor.cpp

@@ -16,15 +16,14 @@
 */
 
 #include <mp-units/compat_macros.h>
+#include <concepts>
 #include <iostream>
-#include <type_traits>
+#include <string>
 #ifdef MP_UNITS_MODULES
 import mp_units;
 #else
 #include <mp-units/format.h>
-#include <mp-units/systems/isq/space_and_time.h>
-#include <mp-units/systems/si/unit_symbols.h>
-#include <mp-units/systems/si/units.h>
+#include <mp-units/systems/si/si.h>
 #endif
 
 /*

example/currency.cpp

@@ -21,14 +21,16 @@
 // SOFTWARE.
 
 #include <mp-units/compat_macros.h>
+#include <concepts>
 #include <iostream>
 #include <map>
+#include <string_view>
+#include <utility>
 #ifdef MP_UNITS_MODULES
 import mp_units.core;
 #else
+#include <mp-units/framework.h>
 #include <mp-units/ostream.h>
-#include <mp-units/quantity.h>
-#include <mp-units/quantity_point.h>
 #endif
 
 using namespace mp_units;

example/glide_computer_lib/include/glide_computer_lib.h

@@ -36,8 +36,8 @@
 #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/quantity_point.h>
 #include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/si/chrono.h>
 #endif

example/include/geographic.h

@@ -31,10 +31,8 @@
 #ifdef MP_UNITS_MODULES
 import mp_units;
 #else
-#include <mp-units/compare.h>
 #include <mp-units/format.h>
-#include <mp-units/quantity.h>
-#include <mp-units/quantity_point.h>
+#include <mp-units/framework.h>
 #include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/si/si.h>
 #endif

example/include/ranged_representation.h

@@ -23,7 +23,7 @@
 #pragma once
 
 #include "validated_type.h"
-#include <mp-units/bits/external/hacks.h>
+#include <mp-units/bits/hacks.h>
 #include <mp-units/compat_macros.h>
 #include <algorithm>
 #include <concepts>
@@ -32,7 +32,7 @@
 import mp_units.core;
 #else
 #include <mp-units/bits/fmt.h>
-#include <mp-units/customization_points.h>
+#include <mp-units/framework/customization_points.h>
 #endif
 
 template<std::movable T, MP_UNITS_CONSTRAINED_NTTP_WORKAROUND(std::convertible_to<T>) auto Min,

example/include/validated_type.h

@@ -23,16 +23,17 @@
 #pragma once
 
 #include <gsl/gsl-lite.hpp>
-#include <mp-units/bits/external/hacks.h>
+#include <mp-units/bits/hacks.h>
 #include <mp-units/compat_macros.h>
+#include <compare>  // IWYU pragma: export
 #include <ostream>
 #include <utility>
 #ifdef MP_UNITS_MODULES
 import mp_units.core;
 #else
-#include <mp-units/bits/external/hacks.h>
 #include <mp-units/bits/fmt.h>
-#include <mp-units/customization_points.h>
+#include <mp-units/bits/hacks.h>
+#include <mp-units/framework/customization_points.h>
 #endif
 
 inline constexpr struct validated_tag {

example/measurement.cpp

@@ -20,17 +20,21 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#include <mp-units/bits/hacks.h>
 #include <mp-units/compat_macros.h>
 #include <cmath>
+#include <compare>  // IWYU pragma: export
+#include <cstdlib>
 #include <exception>
 #include <iostream>
+#include <utility>
 #ifdef MP_UNITS_MODULES
 import mp_units;
 #else
+#include <mp-units/framework.h>
 #include <mp-units/ostream.h>
 #include <mp-units/systems/isq/space_and_time.h>
-#include <mp-units/systems/si/unit_symbols.h>
-#include <mp-units/systems/si/units.h>
+#include <mp-units/systems/si/si.h>
 #endif
 
 namespace {

example/storage_tank.cpp

@@ -25,7 +25,7 @@
 #include <chrono>
 #include <iostream>
 #include <numbers>
-#include <utility>
+#include <string>
 #ifdef MP_UNITS_MODULES
 import mp_units;
 #else

example/strong_angular_quantities.cpp

@@ -24,10 +24,9 @@
 #ifdef MP_UNITS_MODULES
 import mp_units;
 #else
-#include <mp-units/math.h>
 #include <mp-units/ostream.h>
 #include <mp-units/systems/isq_angle/isq_angle.h>
-#include <mp-units/systems/si/unit_symbols.h>
+#include <mp-units/systems/si/si.h>
 #endif
 
 template<class T>

example/total_energy.cpp

@@ -28,9 +28,9 @@ import mp_units;
 #include <mp-units/math.h>
 #include <mp-units/ostream.h>
 #include <mp-units/systems/isq/mechanics.h>
+#include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/natural/natural.h>
-#include <mp-units/systems/si/constants.h>
-#include <mp-units/systems/si/unit_symbols.h>
+#include <mp-units/systems/si/si.h>
 #endif
 
 template<class T>

example/unmanned_aerial_vehicle.cpp

@@ -27,8 +27,8 @@
 #ifdef MP_UNITS_MODULES
 import mp_units;
 #else
+#include <mp-units/framework/quantity_point.h>
 #include <mp-units/ostream.h>
-#include <mp-units/quantity_point.h>
 #include <mp-units/systems/international/international.h>
 #include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/si/unit_symbols.h>