refactor: modules-like behavior for systems removed to improve broken compile-time

Reffers to #32

src/include/units/data/data.h

@@ -22,8 +22,6 @@
 
 #pragma once
 
-#define MP_UNITS_SYSTEM_DATA
-
 #include <units/data/base/information.h>
-#include <units/data/bits/derived/bitrate.h>
+#include <units/data/derived/bitrate.h>
 #include <units/data/prefixes.h>

src/include/units/data/derived/bitrate.h

@@ -22,12 +22,6 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_DATA
-
-#error "Please do not include this file directly. Use `units/physical/data/data.h` to prevent potential ODR violation issues."
-
-#endif
-
 #include <units/data/base/information.h>
 #include <units/derived_dimension.h>
 #include <units/physical/si/base/time.h>

src/include/units/physical/bits/dimensions.h

@@ -1,73 +0,0 @@
-// The MIT License (MIT)
-//
-// Copyright (c) 2018 Mateusz Pusz
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#pragma once
-
-#include <units/concepts.h>
-
-#include <units/physical/bits/absorbed_dose.h>
-#include <units/physical/bits/acceleration.h>
-#include <units/physical/bits/amount_of_substance.h>
-#include <units/physical/bits/angular_velocity.h>
-#include <units/physical/bits/area.h>
-#include <units/physical/bits/capacitance.h>
-#include <units/physical/bits/catalytic_activity.h>
-#include <units/physical/bits/charge_density.h>
-#include <units/physical/bits/concentration.h>
-#include <units/physical/bits/conductance.h>
-#include <units/physical/bits/current_density.h>
-#include <units/physical/bits/density.h>
-#include <units/physical/bits/dimensions.h>
-#include <units/physical/bits/dynamic_viscosity.h>
-#include <units/physical/bits/electric_charge.h>
-#include <units/physical/bits/electric_current.h>
-#include <units/physical/bits/electric_field_strength.h>
-#include <units/physical/bits/energy.h>
-// TODO Add when downcasting issue is solved
-// #include <units/physical/bits/energy_density.h>
-#include <units/physical/bits/force.h>
-#include <units/physical/bits/frequency.h>
-#include <units/physical/bits/heat_capacity.h>
-#include <units/physical/bits/inductance.h>
-#include <units/physical/bits/length.h>
-#include <units/physical/bits/luminance.h>
-#include <units/physical/bits/luminous_intensity.h>
-#include <units/physical/bits/magnetic_flux.h>
-#include <units/physical/bits/magnetic_induction.h>
-#include <units/physical/bits/mass.h>
-#include <units/physical/bits/molar_energy.h>
-#include <units/physical/bits/momentum.h>
-#include <units/physical/bits/permeability.h>
-#include <units/physical/bits/permittivity.h>
-#include <units/physical/bits/power.h>
-#include <units/physical/bits/pressure.h>
-// TODO Add when downcasting issue is solved
-// #include <units/physical/bits/radioactivity.h>
-#include <units/physical/bits/resistance.h>
-#include <units/physical/bits/speed.h>
-#include <units/physical/bits/surface_tension.h>
-#include <units/physical/bits/thermal_conductivity.h>
-#include <units/physical/bits/thermodynamic_temperature.h>
-#include <units/physical/bits/time.h>
-#include <units/physical/bits/torque.h>
-#include <units/physical/bits/voltage.h>
-#include <units/physical/bits/volume.h>

src/include/units/physical/dimensions.h

@@ -22,50 +22,49 @@
 
 #pragma once
 
-#include <units/physical/bits/absorbed_dose.h>
-#include <units/physical/bits/acceleration.h>
-#include <units/physical/bits/amount_of_substance.h>
-#include <units/physical/bits/angular_velocity.h>
-#include <units/physical/bits/area.h>
-#include <units/physical/bits/capacitance.h>
-#include <units/physical/bits/catalytic_activity.h>
-#include <units/physical/bits/charge_density.h>
-#include <units/physical/bits/concentration.h>
-#include <units/physical/bits/conductance.h>
-#include <units/physical/bits/current_density.h>
-#include <units/physical/bits/density.h>
-#include <units/physical/bits/dimensions.h>
-#include <units/physical/bits/dynamic_viscosity.h>
-#include <units/physical/bits/electric_charge.h>
-#include <units/physical/bits/electric_current.h>
-#include <units/physical/bits/electric_field_strength.h>
-#include <units/physical/bits/energy.h>
+#include <units/physical/dimensions/absorbed_dose.h>
+#include <units/physical/dimensions/acceleration.h>
+#include <units/physical/dimensions/amount_of_substance.h>
+#include <units/physical/dimensions/angular_velocity.h>
+#include <units/physical/dimensions/area.h>
+#include <units/physical/dimensions/capacitance.h>
+#include <units/physical/dimensions/catalytic_activity.h>
+#include <units/physical/dimensions/charge_density.h>
+#include <units/physical/dimensions/concentration.h>
+#include <units/physical/dimensions/conductance.h>
+#include <units/physical/dimensions/current_density.h>
+#include <units/physical/dimensions/density.h>
+#include <units/physical/dimensions/dynamic_viscosity.h>
+#include <units/physical/dimensions/electric_charge.h>
+#include <units/physical/dimensions/electric_current.h>
+#include <units/physical/dimensions/electric_field_strength.h>
+#include <units/physical/dimensions/energy.h>
 // TODO Add when downcasting issue is solved
-// #include <units/physical/bits/energy_density.h>
-#include <units/physical/bits/force.h>
-#include <units/physical/bits/frequency.h>
-#include <units/physical/bits/heat_capacity.h>
-#include <units/physical/bits/inductance.h>
-#include <units/physical/bits/length.h>
-#include <units/physical/bits/luminance.h>
-#include <units/physical/bits/luminous_intensity.h>
-#include <units/physical/bits/magnetic_flux.h>
-#include <units/physical/bits/magnetic_induction.h>
-#include <units/physical/bits/mass.h>
-#include <units/physical/bits/molar_energy.h>
-#include <units/physical/bits/momentum.h>
-#include <units/physical/bits/permeability.h>
-#include <units/physical/bits/permittivity.h>
-#include <units/physical/bits/power.h>
-#include <units/physical/bits/pressure.h>
+// #include <units/physical/dimensions/energy_density.h>
+#include <units/physical/dimensions/force.h>
+#include <units/physical/dimensions/frequency.h>
+#include <units/physical/dimensions/heat_capacity.h>
+#include <units/physical/dimensions/inductance.h>
+#include <units/physical/dimensions/length.h>
+#include <units/physical/dimensions/luminance.h>
+#include <units/physical/dimensions/luminous_intensity.h>
+#include <units/physical/dimensions/magnetic_flux.h>
+#include <units/physical/dimensions/magnetic_induction.h>
+#include <units/physical/dimensions/mass.h>
+#include <units/physical/dimensions/molar_energy.h>
+#include <units/physical/dimensions/momentum.h>
+#include <units/physical/dimensions/permeability.h>
+#include <units/physical/dimensions/permittivity.h>
+#include <units/physical/dimensions/power.h>
+#include <units/physical/dimensions/pressure.h>
 // TODO Add when downcasting issue is solved
-// #include <units/physical/bits/radioactivity.h>
-#include <units/physical/bits/resistance.h>
-#include <units/physical/bits/speed.h>
-#include <units/physical/bits/surface_tension.h>
-#include <units/physical/bits/thermal_conductivity.h>
-#include <units/physical/bits/thermodynamic_temperature.h>
-#include <units/physical/bits/time.h>
-#include <units/physical/bits/torque.h>
-#include <units/physical/bits/voltage.h>
-#include <units/physical/bits/volume.h>
+// #include <units/physical/dimensions/radioactivity.h>
+#include <units/physical/dimensions/resistance.h>
+#include <units/physical/dimensions/speed.h>
+#include <units/physical/dimensions/surface_tension.h>
+#include <units/physical/dimensions/thermal_conductivity.h>
+#include <units/physical/dimensions/thermodynamic_temperature.h>
+#include <units/physical/dimensions/time.h>
+#include <units/physical/dimensions/torque.h>
+#include <units/physical/dimensions/voltage.h>
+#include <units/physical/dimensions/volume.h>

src/include/units/physical/dimensions/absorbed_dose.h

@@ -23,8 +23,8 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/energy.h>
-#include <units/physical/bits/mass.h>
+#include <units/physical/dimensions/energy.h>
+#include <units/physical/dimensions/mass.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/acceleration.h

@@ -23,8 +23,8 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/length.h>
-#include <units/physical/bits/time.h>
+#include <units/physical/dimensions/length.h>
+#include <units/physical/dimensions/time.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/angular_velocity.h

@@ -24,7 +24,7 @@
 
 #include <units/generic/angle.h>
 #include <units/concepts.h>
-#include <units/physical/bits/time.h>
+#include <units/physical/dimensions/time.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/area.h

@@ -23,7 +23,7 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/length.h>
+#include <units/physical/dimensions/length.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/capacitance.h

@@ -23,8 +23,8 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/electric_charge.h>
-#include <units/physical/bits/voltage.h>
+#include <units/physical/dimensions/electric_charge.h>
+#include <units/physical/dimensions/voltage.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/catalytic_activity.h

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include <units/physical/bits/amount_of_substance.h>
+#include <units/physical/dimensions/amount_of_substance.h>
 #include <units/concepts.h>
-#include <units/physical/bits/time.h>
+#include <units/physical/dimensions/time.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/charge_density.h

@@ -23,8 +23,8 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/electric_charge.h>
-#include <units/physical/bits/length.h>
+#include <units/physical/dimensions/electric_charge.h>
+#include <units/physical/dimensions/length.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/concentration.h

@@ -23,8 +23,8 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/length.h>
-#include <units/physical/bits/amount_of_substance.h>
+#include <units/physical/dimensions/length.h>
+#include <units/physical/dimensions/amount_of_substance.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/conductance.h

@@ -23,7 +23,7 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/resistance.h>
+#include <units/physical/dimensions/resistance.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/current_density.h

@@ -23,8 +23,8 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/electric_current.h>
-#include <units/physical/bits/length.h>
+#include <units/physical/dimensions/electric_current.h>
+#include <units/physical/dimensions/length.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/density.h

@@ -23,8 +23,8 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/length.h>
-#include <units/physical/bits/mass.h>
+#include <units/physical/dimensions/length.h>
+#include <units/physical/dimensions/mass.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/dynamic_viscosity.h

@@ -23,8 +23,8 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/pressure.h>
-#include <units/physical/bits/time.h>
+#include <units/physical/dimensions/pressure.h>
+#include <units/physical/dimensions/time.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/electric_charge.h

@@ -23,8 +23,8 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/electric_current.h>
-#include <units/physical/bits/time.h>
+#include <units/physical/dimensions/electric_current.h>
+#include <units/physical/dimensions/time.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/electric_field_strength.h

@@ -23,8 +23,8 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/length.h>
-#include <units/physical/bits/voltage.h>
+#include <units/physical/dimensions/length.h>
+#include <units/physical/dimensions/voltage.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/energy.h

@@ -23,8 +23,8 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/force.h>
-#include <units/physical/bits/length.h>
+#include <units/physical/dimensions/force.h>
+#include <units/physical/dimensions/length.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/energy_density.h

@@ -23,8 +23,8 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/energy.h>
-#include <units/physical/bits/length.h>
+#include <units/physical/dimensions/energy.h>
+#include <units/physical/dimensions/length.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/force.h

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include <units/physical/bits/acceleration.h>
+#include <units/physical/dimensions/acceleration.h>
 #include <units/concepts.h>
-#include <units/physical/bits/mass.h>
+#include <units/physical/dimensions/mass.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/frequency.h

@@ -23,7 +23,7 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/time.h>
+#include <units/physical/dimensions/time.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/heat_capacity.h

@@ -22,11 +22,11 @@
 
 #pragma once
 
-#include <units/physical/bits/amount_of_substance.h>
+#include <units/physical/dimensions/amount_of_substance.h>
 #include <units/concepts.h>
-#include <units/physical/bits/energy.h>
-#include <units/physical/bits/mass.h>
-#include <units/physical/bits/thermodynamic_temperature.h>
+#include <units/physical/dimensions/energy.h>
+#include <units/physical/dimensions/mass.h>
+#include <units/physical/dimensions/thermodynamic_temperature.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/inductance.h

@@ -23,8 +23,8 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/electric_current.h>
-#include <units/physical/bits/magnetic_flux.h>
+#include <units/physical/dimensions/electric_current.h>
+#include <units/physical/dimensions/magnetic_flux.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/luminance.h

@@ -23,8 +23,8 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/luminous_intensity.h>
-#include <units/physical/bits/length.h>
+#include <units/physical/dimensions/luminous_intensity.h>
+#include <units/physical/dimensions/length.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/magnetic_flux.h

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include <units/physical/bits/area.h>
+#include <units/physical/dimensions/area.h>
 #include <units/concepts.h>
-#include <units/physical/bits/magnetic_induction.h>
+#include <units/physical/dimensions/magnetic_induction.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/magnetic_induction.h

@@ -23,9 +23,9 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/length.h>
-#include <units/physical/bits/time.h>
-#include <units/physical/bits/voltage.h>
+#include <units/physical/dimensions/length.h>
+#include <units/physical/dimensions/time.h>
+#include <units/physical/dimensions/voltage.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/molar_energy.h

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include <units/physical/bits/amount_of_substance.h>
+#include <units/physical/dimensions/amount_of_substance.h>
 #include <units/concepts.h>
-#include <units/physical/bits/energy.h>
+#include <units/physical/dimensions/energy.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/momentum.h

@@ -23,7 +23,7 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/speed.h>
+#include <units/physical/dimensions/speed.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/permeability.h

@@ -23,8 +23,8 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/inductance.h>
-#include <units/physical/bits/length.h>
+#include <units/physical/dimensions/inductance.h>
+#include <units/physical/dimensions/length.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/permittivity.h

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include <units/physical/bits/capacitance.h>
+#include <units/physical/dimensions/capacitance.h>
 #include <units/concepts.h>
-#include <units/physical/bits/length.h>
+#include <units/physical/dimensions/length.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/power.h

@@ -23,8 +23,8 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/energy.h>
-#include <units/physical/bits/time.h>
+#include <units/physical/dimensions/energy.h>
+#include <units/physical/dimensions/time.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/pressure.h

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include <units/physical/bits/area.h>
+#include <units/physical/dimensions/area.h>
 #include <units/concepts.h>
-#include <units/physical/bits/force.h>
+#include <units/physical/dimensions/force.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/radioactivity.h

@@ -23,7 +23,7 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/time.h>
+#include <units/physical/dimensions/time.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/resistance.h

@@ -23,8 +23,8 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/electric_current.h>
-#include <units/physical/bits/voltage.h>
+#include <units/physical/dimensions/electric_current.h>
+#include <units/physical/dimensions/voltage.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/speed.h

@@ -23,8 +23,8 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/length.h>
-#include <units/physical/bits/time.h>
+#include <units/physical/dimensions/length.h>
+#include <units/physical/dimensions/time.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/surface_tension.h

@@ -23,8 +23,8 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/force.h>
-#include <units/physical/bits/length.h>
+#include <units/physical/dimensions/force.h>
+#include <units/physical/dimensions/length.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/thermal_conductivity.h

@@ -23,9 +23,9 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/length.h>
-#include <units/physical/bits/power.h>
-#include <units/physical/bits/thermodynamic_temperature.h>
+#include <units/physical/dimensions/length.h>
+#include <units/physical/dimensions/power.h>
+#include <units/physical/dimensions/thermodynamic_temperature.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/torque.h

@@ -24,7 +24,7 @@
 
 #include <units/generic/angle.h>
 #include <units/concepts.h>
-#include <units/physical/bits/energy.h>
+#include <units/physical/dimensions/energy.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/voltage.h

@@ -23,8 +23,8 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/electric_current.h>
-#include <units/physical/bits/power.h>
+#include <units/physical/dimensions/electric_current.h>
+#include <units/physical/dimensions/power.h>
 
 namespace units::physical {
 

src/include/units/physical/dimensions/volume.h

@@ -23,7 +23,7 @@
 #pragma once
 
 #include <units/concepts.h>
-#include <units/physical/bits/length.h>
+#include <units/physical/dimensions/length.h>
 
 namespace units::physical {
 

src/include/units/physical/si/base/amount_of_substance.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <units/physical/dimensions.h>
+#include <units/physical/dimensions/amount_of_substance.h>
 #include <units/physical/si/prefixes.h>
 #include <units/quantity.h>
 

src/include/units/physical/si/base/electric_current.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <units/physical/dimensions.h>
+#include <units/physical/dimensions/electric_current.h>
 #include <units/physical/si/prefixes.h>
 #include <units/quantity.h>
 

src/include/units/physical/si/base/length.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <units/physical/dimensions.h>
+#include <units/physical/dimensions/length.h>
 #include <units/physical/si/prefixes.h>
 #include <units/quantity.h>
 

src/include/units/physical/si/base/luminous_intensity.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <units/physical/dimensions.h>
+#include <units/physical/dimensions/luminous_intensity.h>
 #include <units/physical/si/prefixes.h>
 #include <units/quantity.h>
 

src/include/units/physical/si/base/mass.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <units/physical/dimensions.h>
+#include <units/physical/dimensions/mass.h>
 #include <units/physical/si/prefixes.h>
 #include <units/quantity.h>
 

src/include/units/physical/si/base/thermodynamic_temperature.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <units/physical/dimensions.h>
+#include <units/physical/dimensions/thermodynamic_temperature.h>
 #include <units/quantity.h>
 
 namespace units::physical::si {

src/include/units/physical/si/base/time.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <units/physical/dimensions.h>
+#include <units/physical/dimensions/time.h>
 #include <units/physical/si/prefixes.h>
 #include <units/quantity.h>
 

src/include/units/physical/si/cgs/base/length.h

@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include <units/physical/dimensions.h>
 #include <units/physical/si/base/length.h>
 #include <units/quantity.h>
 

src/include/units/physical/si/cgs/base/mass.h

@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include <units/physical/dimensions.h>
 #include <units/physical/si/base/mass.h>
 #include <units/quantity.h>
 

src/include/units/physical/si/cgs/base/time.h

@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include <units/physical/dimensions.h>
 #include <units/physical/si/base/time.h>
 #include <units/quantity.h>
 

src/include/units/physical/si/cgs/cgs.h

@@ -22,16 +22,14 @@
 
 #pragma once
 
-#define MP_UNITS_SYSTEM_SI_CGS
-
 #include <units/physical/si/cgs/base/length.h>
 #include <units/physical/si/cgs/base/mass.h>
 #include <units/physical/si/cgs/base/time.h>
 
-#include <units/physical/si/cgs/bits/derived/acceleration.h>
-#include <units/physical/si/cgs/bits/derived/area.h>
-#include <units/physical/si/cgs/bits/derived/energy.h>
-#include <units/physical/si/cgs/bits/derived/force.h>
-#include <units/physical/si/cgs/bits/derived/power.h>
-#include <units/physical/si/cgs/bits/derived/pressure.h>
-#include <units/physical/si/cgs/bits/derived/speed.h>
+#include <units/physical/si/cgs/derived/acceleration.h>
+#include <units/physical/si/cgs/derived/area.h>
+#include <units/physical/si/cgs/derived/energy.h>
+#include <units/physical/si/cgs/derived/force.h>
+#include <units/physical/si/cgs/derived/power.h>
+#include <units/physical/si/cgs/derived/pressure.h>
+#include <units/physical/si/cgs/derived/speed.h>

src/include/units/physical/si/cgs/derived/acceleration.h

@@ -22,14 +22,8 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI_CGS
-
-#error "Please do not include this file directly. Use `units/physical/si/cgs/cgs.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
-#include <units/physical/si/cgs/bits/derived/speed.h>
+#include <units/physical/dimensions/acceleration.h>
+#include <units/physical/si/cgs/derived/speed.h>
 #include <units/quantity.h>
 
 namespace units::physical::si::cgs {

src/include/units/physical/si/cgs/derived/area.h

@@ -22,15 +22,8 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI_CGS
-
-#error "Please do not include this file directly. Use `units/physical/si/cgs/cgs.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
+#include <units/physical/si/derived/area.h>
 #include <units/physical/si/cgs/base/length.h>
-#include <units/physical/si/si.h>
 #include <units/quantity.h>
 
 namespace units::physical::si::cgs {

src/include/units/physical/si/cgs/derived/energy.h

@@ -22,14 +22,8 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI_CGS
-
-#error "Please do not include this file directly. Use `units/physical/si/cgs/cgs.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
-#include <units/physical/si/cgs/bits/derived/force.h>
+#include <units/physical/dimensions/energy.h>
+#include <units/physical/si/cgs/derived/force.h>
 #include <units/physical/si/prefixes.h>
 #include <units/quantity.h>
 

src/include/units/physical/si/cgs/derived/force.h

@@ -22,14 +22,8 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI_CGS
-
-#error "Please do not include this file directly. Use `units/physical/si/cgs/cgs.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
-#include <units/physical/si/cgs/bits/derived/acceleration.h>
+#include <units/physical/dimensions/force.h>
+#include <units/physical/si/cgs/derived/acceleration.h>
 #include <units/physical/si/cgs/base/mass.h>
 #include <units/physical/si/prefixes.h>
 #include <units/quantity.h>

src/include/units/physical/si/cgs/derived/power.h

@@ -22,14 +22,8 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI_CGS
-
-#error "Please do not include this file directly. Use `units/physical/si/cgs/cgs.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
-#include <units/physical/si/cgs/bits/derived/energy.h>
+#include <units/physical/dimensions/power.h>
+#include <units/physical/si/cgs/derived/energy.h>
 #include <units/physical/si/prefixes.h>
 #include <units/quantity.h>
 

src/include/units/physical/si/cgs/derived/pressure.h

@@ -22,15 +22,9 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI_CGS
-
-#error "Please do not include this file directly. Use `units/physical/si/cgs/cgs.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
-#include <units/physical/si/cgs/bits/derived/area.h>
-#include <units/physical/si/cgs/bits/derived/force.h>
+#include <units/physical/dimensions/pressure.h>
+#include <units/physical/si/cgs/derived/area.h>
+#include <units/physical/si/cgs/derived/force.h>
 #include <units/physical/si/prefixes.h>
 #include <units/quantity.h>
 

src/include/units/physical/si/cgs/derived/speed.h

@@ -22,13 +22,7 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI_CGS
-
-#error "Please do not include this file directly. Use `units/physical/si/cgs/cgs.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
+#include <units/physical/dimensions/speed.h>
 #include <units/physical/si/cgs/base/length.h>
 #include <units/physical/si/cgs/base/time.h>
 #include <units/quantity.h>

src/include/units/physical/si/constants.h

@@ -22,7 +22,13 @@
 
 #pragma once
 
-#include <units/physical/si/si.h>
+#include <units/physical/si/base/amount_of_substance.h>
+#include <units/physical/si/base/thermodynamic_temperature.h>
+#include <units/physical/si/derived/electric_charge.h>
+#include <units/physical/si/derived/energy.h>
+#include <units/physical/si/derived/frequency.h>
+#include <units/physical/si/derived/power.h>
+#include <units/physical/si/derived/speed.h>
 
 namespace units::physical::si::si2019 {
 

src/include/units/physical/si/derived/absorbed_dose.h

@@ -22,14 +22,8 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
-#include <units/physical/si/bits/derived/energy.h>
+#include <units/physical/dimensions/absorbed_dose.h>
+#include <units/physical/si/derived/energy.h>
 #include <units/physical/si/prefixes.h>
 #include <units/quantity.h>
 

src/include/units/physical/si/derived/acceleration.h

@@ -22,14 +22,8 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
-#include <units/physical/si/bits/derived/speed.h>
+#include <units/physical/dimensions/acceleration.h>
+#include <units/physical/si/derived/speed.h>
 #include <units/quantity.h>
 
 namespace units::physical::si {

src/include/units/physical/si/derived/angular_velocity.h

@@ -22,13 +22,7 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
+#include <units/physical/dimensions/angular_velocity.h>
 #include <units/generic/angle.h>
 #include <units/physical/si/base/time.h>
 

src/include/units/physical/si/derived/area.h

@@ -22,13 +22,7 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
+#include <units/physical/dimensions/area.h>
 #include <units/physical/si/base/length.h>
 #include <units/quantity.h>
 

src/include/units/physical/si/derived/capacitance.h

@@ -22,15 +22,9 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
-#include <units/physical/si/bits/derived/electric_charge.h>
-#include <units/physical/si/bits/derived/voltage.h>
+#include <units/physical/dimensions/capacitance.h>
+#include <units/physical/si/derived/electric_charge.h>
+#include <units/physical/si/derived/voltage.h>
 #include <units/physical/si/prefixes.h>
 #include <units/quantity.h>
 

src/include/units/physical/si/derived/catalytic_activity.h

@@ -22,13 +22,7 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
+#include <units/physical/dimensions/catalytic_activity.h>
 #include <units/physical/si/base/amount_of_substance.h>
 #include <units/physical/si/base/time.h>
 #include <units/physical/si/prefixes.h>

src/include/units/physical/si/derived/charge_density.h

@@ -22,14 +22,8 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
-#include <units/physical/si/bits/derived/electric_charge.h>
+#include <units/physical/dimensions/charge_density.h>
+#include <units/physical/si/derived/electric_charge.h>
 #include <units/physical/si/base/length.h>
 #include <units/physical/si/prefixes.h>
 #include <units/quantity.h>

src/include/units/physical/si/derived/concentration.h

@@ -22,13 +22,7 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
+#include <units/physical/dimensions/concentration.h>
 #include <units/physical/si/base/length.h>
 #include <units/physical/si/base/amount_of_substance.h>
 #include <units/quantity.h>

src/include/units/physical/si/derived/conductance.h

@@ -22,14 +22,8 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
-#include <units/physical/si/bits/derived/resistance.h>
+#include <units/physical/dimensions/conductance.h>
+#include <units/physical/si/derived/resistance.h>
 #include <units/physical/si/prefixes.h>
 #include <units/quantity.h>
 

src/include/units/physical/si/derived/current_density.h

@@ -22,13 +22,7 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
+#include <units/physical/dimensions/current_density.h>
 #include <units/physical/si/base/electric_current.h>
 #include <units/physical/si/base/length.h>
 #include <units/physical/si/prefixes.h>

src/include/units/physical/si/derived/density.h

@@ -22,13 +22,7 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
+#include <units/physical/dimensions/density.h>
 #include <units/physical/si/base/mass.h>
 #include <units/physical/si/base/length.h>
 #include <units/physical/si/prefixes.h>

src/include/units/physical/si/derived/dynamic_viscosity.h

@@ -22,15 +22,9 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
+#include <units/physical/dimensions/dynamic_viscosity.h>
 #include <units/physical/si/base/time.h>
-#include <units/physical/si/bits/derived/pressure.h>
+#include <units/physical/si/derived/pressure.h>
 #include <units/quantity.h>
 
 namespace units::physical::si {

src/include/units/physical/si/derived/electric_charge.h

@@ -22,13 +22,7 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
+#include <units/physical/dimensions/electric_charge.h>
 #include <units/physical/si/base/electric_current.h>
 #include <units/physical/si/base/time.h>
 #include <units/quantity.h>

src/include/units/physical/si/derived/electric_field_strength.h

@@ -22,14 +22,8 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
-#include <units/physical/si/bits/derived/voltage.h>
+#include <units/physical/dimensions/electric_field_strength.h>
+#include <units/physical/si/derived/voltage.h>
 #include <units/quantity.h>
 
 namespace units::physical::si {

src/include/units/physical/si/derived/energy.h

@@ -22,14 +22,8 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
-#include <units/physical/si/bits/derived/force.h>
+#include <units/physical/dimensions/energy.h>
+#include <units/physical/si/derived/force.h>
 #include <units/physical/si/prefixes.h>
 #include <units/quantity.h>
 

src/include/units/physical/si/derived/force.h

@@ -22,14 +22,8 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
-#include <units/physical/si/bits/derived/acceleration.h>
+#include <units/physical/dimensions/force.h>
+#include <units/physical/si/derived/acceleration.h>
 #include <units/physical/si/base/mass.h>
 #include <units/physical/si/prefixes.h>
 #include <units/quantity.h>

src/include/units/physical/si/derived/frequency.h

@@ -22,13 +22,7 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
+#include <units/physical/dimensions/frequency.h>
 #include <units/physical/si/base/time.h>
 #include <units/quantity.h>
 

src/include/units/physical/si/derived/heat_capacity.h

@@ -22,15 +22,9 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
+#include <units/physical/dimensions/heat_capacity.h>
 #include <units/physical/si/base/thermodynamic_temperature.h>
-#include <units/physical/si/bits/derived/energy.h>
+#include <units/physical/si/derived/energy.h>
 #include <units/physical/si/base/mass.h>
 #include <units/physical/si/base/amount_of_substance.h>
 #include <units/quantity.h>

src/include/units/physical/si/derived/inductance.h

@@ -22,14 +22,8 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
-#include <units/physical/si/bits/derived/magnetic_flux.h>
+#include <units/physical/dimensions/inductance.h>
+#include <units/physical/si/derived/magnetic_flux.h>
 #include <units/physical/si/base/electric_current.h>
 #include <units/quantity.h>
 

src/include/units/physical/si/derived/luminance.h

@@ -22,13 +22,7 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
+#include <units/physical/dimensions/luminance.h>
 #include <units/physical/si/base/length.h>
 #include <units/physical/si/base/luminous_intensity.h>
 #include <units/quantity.h>

src/include/units/physical/si/derived/magnetic_flux.h

@@ -22,15 +22,9 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
-#include <units/physical/si/bits/derived/magnetic_induction.h>
-#include <units/physical/si/bits/derived/area.h>
+#include <units/physical/dimensions/magnetic_flux.h>
+#include <units/physical/si/derived/magnetic_induction.h>
+#include <units/physical/si/derived/area.h>
 #include <units/quantity.h>
 
 namespace units::physical::si {

src/include/units/physical/si/derived/magnetic_induction.h

@@ -22,14 +22,8 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
-#include <units/physical/si/bits/derived/voltage.h>
+#include <units/physical/dimensions/magnetic_induction.h>
+#include <units/physical/si/derived/voltage.h>
 #include <units/physical/si/base/time.h>
 #include <units/physical/si/base/length.h>
 #include <units/physical/si/prefixes.h>

src/include/units/physical/si/derived/molar_energy.h

@@ -22,14 +22,8 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
-#include <units/physical/si/bits/derived/energy.h>
+#include <units/physical/dimensions/molar_energy.h>
+#include <units/physical/si/derived/energy.h>
 #include <units/physical/si/base/amount_of_substance.h>
 #include <units/physical/si/prefixes.h>
 #include <units/quantity.h>

src/include/units/physical/si/derived/momentum.h

@@ -22,15 +22,9 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
+#include <units/physical/dimensions/momentum.h>
 #include <units/physical/si/base/mass.h>
-#include <units/physical/si/bits/derived/speed.h>
+#include <units/physical/si/derived/speed.h>
 #include <units/quantity.h>
 
 namespace units::physical::si {

src/include/units/physical/si/derived/permeability.h

@@ -22,14 +22,8 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
-#include <units/physical/si/bits/derived/inductance.h>
+#include <units/physical/dimensions/permeability.h>
+#include <units/physical/si/derived/inductance.h>
 #include <units/physical/si/prefixes.h>
 #include <units/quantity.h>
 

src/include/units/physical/si/derived/permittivity.h

@@ -22,14 +22,8 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
-#include <units/physical/si/bits/derived/capacitance.h>
+#include <units/physical/dimensions/permittivity.h>
+#include <units/physical/si/derived/capacitance.h>
 #include <units/physical/si/prefixes.h>
 #include <units/quantity.h>
 

src/include/units/physical/si/derived/power.h

@@ -22,14 +22,8 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
-#include <units/physical/si/bits/derived/energy.h>
+#include <units/physical/dimensions/power.h>
+#include <units/physical/si/derived/energy.h>
 #include <units/physical/si/prefixes.h>
 #include <units/quantity.h>
 

src/include/units/physical/si/derived/pressure.h

@@ -22,15 +22,9 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
-#include <units/physical/si/bits/derived/area.h>
-#include <units/physical/si/bits/derived/force.h>
+#include <units/physical/dimensions/pressure.h>
+#include <units/physical/si/derived/area.h>
+#include <units/physical/si/derived/force.h>
 #include <units/physical/si/prefixes.h>
 #include <units/quantity.h>
 

src/include/units/physical/si/derived/resistance.h

@@ -22,14 +22,8 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
-#include <units/physical/si/bits/derived/voltage.h>
+#include <units/physical/dimensions/resistance.h>
+#include <units/physical/si/derived/voltage.h>
 #include <units/physical/si/base/electric_current.h>
 #include <units/physical/si/prefixes.h>
 #include <units/quantity.h>

src/include/units/physical/si/derived/speed.h

@@ -22,13 +22,7 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
+#include <units/physical/dimensions/speed.h>
 #include <units/physical/si/base/length.h>
 #include <units/physical/si/base/time.h>
 #include <units/quantity.h>

src/include/units/physical/si/derived/surface_tension.h

@@ -22,14 +22,8 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
-#include <units/physical/si/bits/derived/force.h>
+#include <units/physical/dimensions/surface_tension.h>
+#include <units/physical/si/derived/force.h>
 #include <units/quantity.h>
 
 namespace units::physical::si {

src/include/units/physical/si/derived/thermal_conductivity.h

@@ -22,14 +22,8 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
-#include <units/physical/si/bits/derived/power.h>
+#include <units/physical/dimensions/thermal_conductivity.h>
+#include <units/physical/si/derived/power.h>
 #include <units/physical/si/base/thermodynamic_temperature.h>
 #include <units/quantity.h>
 

src/include/units/physical/si/derived/torque.h

@@ -22,14 +22,8 @@
 
 #pragma once
 
-#ifndef MP_UNITS_SYSTEM_SI
-
-#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues."
-
-#endif
-
-#include <units/physical/dimensions.h>
-#include <units/physical/si/bits/derived/energy.h>
+#include <units/physical/dimensions/torque.h>
+#include <units/physical/si/derived/energy.h>
 #include <units/generic/angle.h>
 #include <units/physical/si/prefixes.h>
 #include <units/quantity.h>