$include_dir="/home/hyper-archives/boost-commit/include"; include("$include_dir/msg-header.inc") ?>
From: matthiasschabel_at_[hidden]
Date: 2007-05-31 16:09:48
Author: matthiasschabel
Date: 2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
New Revision: 4397
URL: http://svn.boost.org/trac/boost/changeset/4397
Log:
header name changes
Text files modified: 
   sandbox/units/boost/units/systems/abstract.hpp                        |    13 ++++++++-                               
   sandbox/units/boost/units/systems/angle/degrees.hpp                   |     9 +++----                                 
   sandbox/units/boost/units/systems/angle/gradians.hpp                  |     7 ++---                                   
   sandbox/units/boost/units/systems/angle/revolutions.hpp               |     4 +-                                      
   sandbox/units/boost/units/systems/base_dimensions.hpp                 |    18 +++++++-------                          
   sandbox/units/boost/units/systems/base_units.hpp                      |     2 +                                       
   sandbox/units/boost/units/systems/base_units/ampere_base_unit.hpp     |     2                                         
   sandbox/units/boost/units/systems/base_units/candela_base_unit.hpp    |     2                                         
   sandbox/units/boost/units/systems/base_units/celsius_base_unit.hpp    |     2                                         
   sandbox/units/boost/units/systems/base_units/degree_base_unit.hpp     |     2                                         
   sandbox/units/boost/units/systems/base_units/fahrenheit_base_unit.hpp |     2                                         
   sandbox/units/boost/units/systems/base_units/foot_base_unit.hpp       |     2                                         
   sandbox/units/boost/units/systems/base_units/gradian_base_unit.hpp    |     2                                         
   sandbox/units/boost/units/systems/base_units/gram_base_unit.hpp       |     2                                         
   sandbox/units/boost/units/systems/base_units/hour_base_unit.hpp       |     2                                         
   sandbox/units/boost/units/systems/base_units/inch_base_unit.hpp       |     2                                         
   sandbox/units/boost/units/systems/base_units/kelvin_base_unit.hpp     |     2                                         
   sandbox/units/boost/units/systems/base_units/meter_base_unit.hpp      |     2                                         
   sandbox/units/boost/units/systems/base_units/mile_base_unit.hpp       |     2                                         
   sandbox/units/boost/units/systems/base_units/minute_base_unit.hpp     |     2                                         
   sandbox/units/boost/units/systems/base_units/mole_base_unit.hpp       |     2                                         
   sandbox/units/boost/units/systems/base_units/radian_base_unit.hpp     |     2                                         
   sandbox/units/boost/units/systems/base_units/second_base_unit.hpp     |     2                                         
   sandbox/units/boost/units/systems/base_units/steradian_base_unit.hpp  |     2                                         
   sandbox/units/boost/units/systems/base_units/yard_base_unit.hpp       |     2                                         
   sandbox/units/boost/units/systems/cgs/acceleration.hpp                |     2                                         
   sandbox/units/boost/units/systems/cgs/area.hpp                        |     2                                         
   sandbox/units/boost/units/systems/cgs/dynamic_viscosity.hpp           |     2                                         
   sandbox/units/boost/units/systems/cgs/energy.hpp                      |     2                                         
   sandbox/units/boost/units/systems/cgs/force.hpp                       |     2                                         
   sandbox/units/boost/units/systems/cgs/frequency.hpp                   |     2                                         
   sandbox/units/boost/units/systems/cgs/kinematic_viscosity.hpp         |     2                                         
   sandbox/units/boost/units/systems/cgs/mass_density.hpp                |     2                                         
   sandbox/units/boost/units/systems/cgs/momentum.hpp                    |     2                                         
   sandbox/units/boost/units/systems/cgs/power.hpp                       |     2                                         
   sandbox/units/boost/units/systems/cgs/pressure.hpp                    |     2                                         
   sandbox/units/boost/units/systems/cgs/velocity.hpp                    |     2                                         
   sandbox/units/boost/units/systems/cgs/volume.hpp                      |     2                                         
   sandbox/units/boost/units/systems/cgs/wavenumber.hpp                  |     2                                         
   sandbox/units/boost/units/systems/derived_dimensions.hpp              |    50 ++++++++++++++++++++--------------------
   sandbox/units/boost/units/systems/si/absorbed_dose.hpp                |     2                                         
   sandbox/units/boost/units/systems/si/acceleration.hpp                 |     2                                         
   sandbox/units/boost/units/systems/si/action.hpp                       |     2                                         
   sandbox/units/boost/units/systems/si/activity.hpp                     |     2                                         
   sandbox/units/boost/units/systems/si/angular_velocity.hpp             |     2                                         
   sandbox/units/boost/units/systems/si/area.hpp                         |     2                                         
   sandbox/units/boost/units/systems/si/dose_equivalent.hpp              |     2                                         
   sandbox/units/boost/units/systems/si/dynamic_viscosity.hpp            |     2                                         
   sandbox/units/boost/units/systems/si/energy.hpp                       |     2                                         
   sandbox/units/boost/units/systems/si/force.hpp                        |     2                                         
   sandbox/units/boost/units/systems/si/frequency.hpp                    |     2                                         
   sandbox/units/boost/units/systems/si/illuminance.hpp                  |     2                                         
   sandbox/units/boost/units/systems/si/kinematic_viscosity.hpp          |     2                                         
   sandbox/units/boost/units/systems/si/luminous_flux.hpp                |     2                                         
   sandbox/units/boost/units/systems/si/mass_density.hpp                 |     2                                         
   sandbox/units/boost/units/systems/si/momentum.hpp                     |     2                                         
   sandbox/units/boost/units/systems/si/power.hpp                        |     2                                         
   sandbox/units/boost/units/systems/si/pressure.hpp                     |     2                                         
   sandbox/units/boost/units/systems/si/surface_density.hpp              |     2                                         
   sandbox/units/boost/units/systems/si/velocity.hpp                     |     2                                         
   sandbox/units/boost/units/systems/si/volume.hpp                       |     2                                         
   sandbox/units/boost/units/systems/si/wavenumber.hpp                   |     2                                         
   sandbox/units/boost/units/systems/temperature/celsius.hpp             |     3 -                                       
   sandbox/units/boost/units/systems/temperature/fahrenheit.hpp          |     3 -                                       
   64 files changed, 113 insertions(+), 106 deletions(-)
Modified: sandbox/units/boost/units/systems/abstract.hpp
==============================================================================
--- sandbox/units/boost/units/systems/abstract.hpp	(original)
+++ sandbox/units/boost/units/systems/abstract.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -14,12 +14,21 @@
 #include <string>
 
 #include <boost/units/conversion.hpp>
-#include <boost/units/systems/physical_units.hpp>
-#include <boost/units/quantity.hpp>
+#include <boost/units/unit.hpp>
 
 #include <boost/units/make_system.hpp>
 #include <boost/units/base_unit.hpp>
 
+#include <boost/units/systems/physical_dimensions/amount.hpp>
+#include <boost/units/systems/physical_dimensions/current.hpp>
+#include <boost/units/systems/physical_dimensions/length.hpp>
+#include <boost/units/systems/physical_dimensions/luminous_intensity.hpp>
+#include <boost/units/systems/physical_dimensions/mass.hpp>
+#include <boost/units/systems/physical_dimensions/plane_angle.hpp>
+#include <boost/units/systems/physical_dimensions/solid_angle.hpp>
+#include <boost/units/systems/physical_dimensions/temperature.hpp>
+#include <boost/units/systems/physical_dimensions/time.hpp>
+
 namespace boost {
 
 namespace units {
Modified: sandbox/units/boost/units/systems/angle/degrees.hpp
==============================================================================
--- sandbox/units/boost/units/systems/angle/degrees.hpp	(original)
+++ sandbox/units/boost/units/systems/angle/degrees.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -15,11 +15,10 @@
 
 #include <boost/units/conversion.hpp>
 #include <boost/units/io.hpp>
-#include <boost/units/quantity.hpp>
 #include <boost/units/static_constant.hpp>
+#include <boost/units/unit.hpp>
 #include <boost/units/make_system.hpp>
-#include <boost/units/systems/physical_units.hpp>
-#include <boost/units/systems/base_units.hpp>
+#include <boost/units/systems/base_units/degree_base_unit.hpp>
 
 namespace boost {
 
@@ -29,8 +28,8 @@
 
 typedef make_system<degree_base_unit>::type system;
 
-typedef unit<dimensionless_type,system>     dimensionless;
-typedef unit<plane_angle_dimension,system>       plane_angle;           ///< angle degree unit constant
+typedef unit<dimensionless_type,system>         dimensionless;
+typedef unit<plane_angle_dimension,system>      plane_angle;           ///< angle degree unit constant
 
 BOOST_UNITS_STATIC_CONSTANT(degree,plane_angle);
 BOOST_UNITS_STATIC_CONSTANT(degrees,plane_angle);
Modified: sandbox/units/boost/units/systems/angle/gradians.hpp
==============================================================================
--- sandbox/units/boost/units/systems/angle/gradians.hpp	(original)
+++ sandbox/units/boost/units/systems/angle/gradians.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -18,8 +18,7 @@
 #include <boost/units/quantity.hpp>
 #include <boost/units/static_constant.hpp>
 #include <boost/units/make_system.hpp>
-#include <boost/units/systems/physical_units.hpp>
-#include <boost/units/systems/base_units.hpp>
+#include <boost/units/systems/base_units/gradian_base_unit.hpp>
 
 namespace boost {
 
@@ -29,8 +28,8 @@
 
 typedef make_system<gradian_base_unit>::type system;
 
-typedef unit<dimensionless_type,system>     dimensionless;
-typedef unit<plane_angle_dimension,system>       plane_angle;          ///< angle gradian unit constant
+typedef unit<dimensionless_type,system>         dimensionless;
+typedef unit<plane_angle_dimension,system>      plane_angle;          ///< angle gradian unit constant
 
 BOOST_UNITS_STATIC_CONSTANT(gradian,plane_angle);
 BOOST_UNITS_STATIC_CONSTANT(gradians,plane_angle);
Modified: sandbox/units/boost/units/systems/angle/revolutions.hpp
==============================================================================
--- sandbox/units/boost/units/systems/angle/revolutions.hpp	(original)
+++ sandbox/units/boost/units/systems/angle/revolutions.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -17,8 +17,8 @@
 #include <boost/units/io.hpp>
 #include <boost/units/quantity.hpp>
 #include <boost/units/static_constant.hpp>
-#include <boost/units/system.hpp>
-#include <boost/units/systems/physical_units.hpp>
+
+#include <boost/units/systems/base_units/revolution_base_unit.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/base_dimensions.hpp
==============================================================================
--- sandbox/units/boost/units/systems/base_dimensions.hpp	(original)
+++ sandbox/units/boost/units/systems/base_dimensions.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -20,14 +20,14 @@
 /// However, incorrect use of degrees and radians is a common source of errors, 
 /// so we treat them on the same footing as the seven physical dimensions.
 
-#include <boost/units/systems/base_dimensions/amount_base_dimension.hpp>
-#include <boost/units/systems/base_dimensions/current_base_dimension.hpp>
-#include <boost/units/systems/base_dimensions/length_base_dimension.hpp>
-#include <boost/units/systems/base_dimensions/luminous_intensity_base_dimension.hpp>
-#include <boost/units/systems/base_dimensions/mass_base_dimension.hpp>
-#include <boost/units/systems/base_dimensions/plane_angle_base_dimension.hpp>
-#include <boost/units/systems/base_dimensions/solid_angle_base_dimension.hpp>
-#include <boost/units/systems/base_dimensions/temperature_base_dimension.hpp>
-#include <boost/units/systems/base_dimensions/time_base_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/amount.hpp>
+#include <boost/units/systems/physical_dimensions/current.hpp>
+#include <boost/units/systems/physical_dimensions/length.hpp>
+#include <boost/units/systems/physical_dimensions/luminous_intensity.hpp>
+#include <boost/units/systems/physical_dimensions/mass.hpp>
+#include <boost/units/systems/physical_dimensions/plane_angle.hpp>
+#include <boost/units/systems/physical_dimensions/solid_angle.hpp>
+#include <boost/units/systems/physical_dimensions/temperature.hpp>
+#include <boost/units/systems/physical_dimensions/time.hpp>
 
 #endif // BOOST_UNITS_BASE_DIMENSIONS_HPP
Modified: sandbox/units/boost/units/systems/base_units.hpp
==============================================================================
--- sandbox/units/boost/units/systems/base_units.hpp	(original)
+++ sandbox/units/boost/units/systems/base_units.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -37,6 +37,7 @@
 #include <boost/units/systems/base_units/minute_base_unit.hpp>
 #include <boost/units/systems/base_units/mole_base_unit.hpp>
 #include <boost/units/systems/base_units/radian_base_unit.hpp>
+#include <boost/units/systems/base_units/revolution_base_unit.hpp>
 #include <boost/units/systems/base_units/second_base_unit.hpp>
 #include <boost/units/systems/base_units/steradian_base_unit.hpp>
 #include <boost/units/systems/base_units/yard_base_unit.hpp>
@@ -69,6 +70,7 @@
 
 BOOST_UNITS_DEFINE_CONVERSION(boost::units::radian_base_unit, boost::units::degree_base_unit::unit_type, double, 180/3.14159265358979323846);
 BOOST_UNITS_DEFINE_CONVERSION(boost::units::radian_base_unit, boost::units::gradian_base_unit::unit_type, double, 200/3.14159265358979323846);
+BOOST_UNITS_DEFINE_CONVERSION(boost::units::radian_base_unit, boost::units::revolution_base_unit::unit_type, double, 0.5/3.14159265358979323846);
 BOOST_UNITS_DEFINE_CONVERSION(boost::units::degree_base_unit, boost::units::gradian_base_unit::unit_type, double, 10/9.);
 
 #endif // BOOST_UNITS_OTHER_UNITS_HPP_INCLUDED
Modified: sandbox/units/boost/units/systems/base_units/ampere_base_unit.hpp
==============================================================================
--- sandbox/units/boost/units/systems/base_units/ampere_base_unit.hpp	(original)
+++ sandbox/units/boost/units/systems/base_units/ampere_base_unit.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -15,7 +15,7 @@
 
 #include <boost/units/config.hpp>
 #include <boost/units/base_unit.hpp>
-#include <boost/units/systems/base_dimensions/current_base_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/current.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/base_units/candela_base_unit.hpp
==============================================================================
--- sandbox/units/boost/units/systems/base_units/candela_base_unit.hpp	(original)
+++ sandbox/units/boost/units/systems/base_units/candela_base_unit.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -15,7 +15,7 @@
 
 #include <boost/units/config.hpp>
 #include <boost/units/base_unit.hpp>
-#include <boost/units/systems/base_dimensions/luminous_intensity_base_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/luminous_intensity.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/base_units/celsius_base_unit.hpp
==============================================================================
--- sandbox/units/boost/units/systems/base_units/celsius_base_unit.hpp	(original)
+++ sandbox/units/boost/units/systems/base_units/celsius_base_unit.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -15,7 +15,7 @@
 
 #include <boost/units/config.hpp>
 #include <boost/units/base_unit.hpp>
-#include <boost/units/systems/base_dimensions/temperature_base_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/temperature.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/base_units/degree_base_unit.hpp
==============================================================================
--- sandbox/units/boost/units/systems/base_units/degree_base_unit.hpp	(original)
+++ sandbox/units/boost/units/systems/base_units/degree_base_unit.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -15,7 +15,7 @@
 
 #include <boost/units/config.hpp>
 #include <boost/units/base_unit.hpp>
-#include <boost/units/systems/base_dimensions/plane_angle_base_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/plane_angle.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/base_units/fahrenheit_base_unit.hpp
==============================================================================
--- sandbox/units/boost/units/systems/base_units/fahrenheit_base_unit.hpp	(original)
+++ sandbox/units/boost/units/systems/base_units/fahrenheit_base_unit.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -15,7 +15,7 @@
 
 #include <boost/units/config.hpp>
 #include <boost/units/base_unit.hpp>
-#include <boost/units/systems/base_dimensions/temperature_base_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/temperature.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/base_units/foot_base_unit.hpp
==============================================================================
--- sandbox/units/boost/units/systems/base_units/foot_base_unit.hpp	(original)
+++ sandbox/units/boost/units/systems/base_units/foot_base_unit.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -15,7 +15,7 @@
 
 #include <boost/units/config.hpp>
 #include <boost/units/base_unit.hpp>
-#include <boost/units/systems/base_dimensions/length_base_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/length.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/base_units/gradian_base_unit.hpp
==============================================================================
--- sandbox/units/boost/units/systems/base_units/gradian_base_unit.hpp	(original)
+++ sandbox/units/boost/units/systems/base_units/gradian_base_unit.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -15,7 +15,7 @@
 
 #include <boost/units/config.hpp>
 #include <boost/units/base_unit.hpp>
-#include <boost/units/systems/base_dimensions/plane_angle_base_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/plane_angle.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/base_units/gram_base_unit.hpp
==============================================================================
--- sandbox/units/boost/units/systems/base_units/gram_base_unit.hpp	(original)
+++ sandbox/units/boost/units/systems/base_units/gram_base_unit.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -16,7 +16,7 @@
 #include <boost/units/config.hpp>
 #include <boost/units/base_unit.hpp>
 #include <boost/units/scaled_base_unit.hpp>
-#include <boost/units/systems/base_dimensions/mass_base_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/mass.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/base_units/hour_base_unit.hpp
==============================================================================
--- sandbox/units/boost/units/systems/base_units/hour_base_unit.hpp	(original)
+++ sandbox/units/boost/units/systems/base_units/hour_base_unit.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -15,7 +15,7 @@
 
 #include <boost/units/config.hpp>
 #include <boost/units/base_unit.hpp>
-#include <boost/units/systems/base_dimensions/time_base_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/time.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/base_units/inch_base_unit.hpp
==============================================================================
--- sandbox/units/boost/units/systems/base_units/inch_base_unit.hpp	(original)
+++ sandbox/units/boost/units/systems/base_units/inch_base_unit.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -15,7 +15,7 @@
 
 #include <boost/units/config.hpp>
 #include <boost/units/base_unit.hpp>
-#include <boost/units/systems/base_dimensions/length_base_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/length.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/base_units/kelvin_base_unit.hpp
==============================================================================
--- sandbox/units/boost/units/systems/base_units/kelvin_base_unit.hpp	(original)
+++ sandbox/units/boost/units/systems/base_units/kelvin_base_unit.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -15,7 +15,7 @@
 
 #include <boost/units/config.hpp>
 #include <boost/units/base_unit.hpp>
-#include <boost/units/systems/base_dimensions/temperature_base_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/temperature.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/base_units/meter_base_unit.hpp
==============================================================================
--- sandbox/units/boost/units/systems/base_units/meter_base_unit.hpp	(original)
+++ sandbox/units/boost/units/systems/base_units/meter_base_unit.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -16,7 +16,7 @@
 #include <boost/units/config.hpp>
 #include <boost/units/base_unit.hpp>
 #include <boost/units/scaled_base_unit.hpp>
-#include <boost/units/systems/base_dimensions/length_base_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/length.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/base_units/mile_base_unit.hpp
==============================================================================
--- sandbox/units/boost/units/systems/base_units/mile_base_unit.hpp	(original)
+++ sandbox/units/boost/units/systems/base_units/mile_base_unit.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -15,7 +15,7 @@
 
 #include <boost/units/config.hpp>
 #include <boost/units/base_unit.hpp>
-#include <boost/units/systems/base_dimensions/length_base_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/length.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/base_units/minute_base_unit.hpp
==============================================================================
--- sandbox/units/boost/units/systems/base_units/minute_base_unit.hpp	(original)
+++ sandbox/units/boost/units/systems/base_units/minute_base_unit.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -15,7 +15,7 @@
 
 #include <boost/units/config.hpp>
 #include <boost/units/base_unit.hpp>
-#include <boost/units/systems/base_dimensions/time_base_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/time.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/base_units/mole_base_unit.hpp
==============================================================================
--- sandbox/units/boost/units/systems/base_units/mole_base_unit.hpp	(original)
+++ sandbox/units/boost/units/systems/base_units/mole_base_unit.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -15,7 +15,7 @@
 
 #include <boost/units/config.hpp>
 #include <boost/units/base_unit.hpp>
-#include <boost/units/systems/base_dimensions/amount_base_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/amount.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/base_units/radian_base_unit.hpp
==============================================================================
--- sandbox/units/boost/units/systems/base_units/radian_base_unit.hpp	(original)
+++ sandbox/units/boost/units/systems/base_units/radian_base_unit.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -15,7 +15,7 @@
 
 #include <boost/units/config.hpp>
 #include <boost/units/base_unit.hpp>
-#include <boost/units/systems/base_dimensions/plane_angle_base_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/plane_angle.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/base_units/second_base_unit.hpp
==============================================================================
--- sandbox/units/boost/units/systems/base_units/second_base_unit.hpp	(original)
+++ sandbox/units/boost/units/systems/base_units/second_base_unit.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -15,7 +15,7 @@
 
 #include <boost/units/config.hpp>
 #include <boost/units/base_unit.hpp>
-#include <boost/units/systems/base_dimensions/time_base_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/time.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/base_units/steradian_base_unit.hpp
==============================================================================
--- sandbox/units/boost/units/systems/base_units/steradian_base_unit.hpp	(original)
+++ sandbox/units/boost/units/systems/base_units/steradian_base_unit.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -15,7 +15,7 @@
 
 #include <boost/units/config.hpp>
 #include <boost/units/base_unit.hpp>
-#include <boost/units/systems/base_dimensions/solid_angle_base_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/solid_angle.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/base_units/yard_base_unit.hpp
==============================================================================
--- sandbox/units/boost/units/systems/base_units/yard_base_unit.hpp	(original)
+++ sandbox/units/boost/units/systems/base_units/yard_base_unit.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -15,7 +15,7 @@
 
 #include <boost/units/config.hpp>
 #include <boost/units/base_unit.hpp>
-#include <boost/units/systems/base_dimensions/length_base_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/length.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/cgs/acceleration.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/acceleration.hpp	(original)
+++ sandbox/units/boost/units/systems/cgs/acceleration.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_CGS_ACCELERATION_HPP
 
 #include <boost/units/systems/cgs/base.hpp>
-#include <boost/units/systems/derived_dimensions/acceleration_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/acceleration.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/cgs/area.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/area.hpp	(original)
+++ sandbox/units/boost/units/systems/cgs/area.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_CGS_AREA_HPP
 
 #include <boost/units/systems/cgs/base.hpp>
-#include <boost/units/systems/derived_dimensions/area_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/area.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/cgs/dynamic_viscosity.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/dynamic_viscosity.hpp	(original)
+++ sandbox/units/boost/units/systems/cgs/dynamic_viscosity.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_CGS_DYNAMIC_VISCOSITY_HPP
 
 #include <boost/units/systems/cgs/base.hpp>
-#include <boost/units/systems/derived_dimensions/dynamic_viscosity_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/dynamic_viscosity.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/cgs/energy.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/energy.hpp	(original)
+++ sandbox/units/boost/units/systems/cgs/energy.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_CGS_ENERGY_HPP
 
 #include <boost/units/systems/cgs/base.hpp>
-#include <boost/units/systems/derived_dimensions/energy_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/energy.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/cgs/force.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/force.hpp	(original)
+++ sandbox/units/boost/units/systems/cgs/force.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_CGS_FORCE_HPP
 
 #include <boost/units/systems/cgs/base.hpp>
-#include <boost/units/systems/derived_dimensions/force_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/force.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/cgs/frequency.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/frequency.hpp	(original)
+++ sandbox/units/boost/units/systems/cgs/frequency.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_CGS_FREQUENCY_HPP
 
 #include <boost/units/systems/cgs/base.hpp>
-#include <boost/units/systems/derived_dimensions/frequency_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/frequency.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/cgs/kinematic_viscosity.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/kinematic_viscosity.hpp	(original)
+++ sandbox/units/boost/units/systems/cgs/kinematic_viscosity.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_CGS_KINEMATIC_VISCOSITY_HPP
 
 #include <boost/units/systems/cgs/base.hpp>
-#include <boost/units/systems/derived_dimensions/kinematic_viscosity_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/kinematic_viscosity.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/cgs/mass_density.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/mass_density.hpp	(original)
+++ sandbox/units/boost/units/systems/cgs/mass_density.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_CGS_MASS_DENSITY_HPP
 
 #include <boost/units/systems/cgs/base.hpp>
-#include <boost/units/systems/derived_dimensions/mass_density_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/mass_density.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/cgs/momentum.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/momentum.hpp	(original)
+++ sandbox/units/boost/units/systems/cgs/momentum.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_CGS_MOMENTUM_HPP
 
 #include <boost/units/systems/cgs/base.hpp>
-#include <boost/units/systems/derived_dimensions/momentum_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/momentum.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/cgs/power.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/power.hpp	(original)
+++ sandbox/units/boost/units/systems/cgs/power.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_CGS_POWER_HPP
 
 #include <boost/units/systems/cgs/base.hpp>
-#include <boost/units/systems/derived_dimensions/power_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/power.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/cgs/pressure.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/pressure.hpp	(original)
+++ sandbox/units/boost/units/systems/cgs/pressure.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_CGS_PRESSURE_HPP
 
 #include <boost/units/systems/cgs/base.hpp>
-#include <boost/units/systems/derived_dimensions/pressure_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/pressure.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/cgs/velocity.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/velocity.hpp	(original)
+++ sandbox/units/boost/units/systems/cgs/velocity.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_CGS_VELOCITY_HPP
 
 #include <boost/units/systems/cgs/base.hpp>
-#include <boost/units/systems/derived_dimensions/velocity_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/velocity.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/cgs/volume.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/volume.hpp	(original)
+++ sandbox/units/boost/units/systems/cgs/volume.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_CGS_VOLUME_HPP
 
 #include <boost/units/systems/cgs/base.hpp>
-#include <boost/units/systems/derived_dimensions/volume_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/volume.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/cgs/wavenumber.hpp
==============================================================================
--- sandbox/units/boost/units/systems/cgs/wavenumber.hpp	(original)
+++ sandbox/units/boost/units/systems/cgs/wavenumber.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_CGS_WAVENUMBER_HPP
 
 #include <boost/units/systems/cgs/base.hpp>
-#include <boost/units/systems/derived_dimensions/wavenumber_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/wavenumber.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/derived_dimensions.hpp
==============================================================================
--- sandbox/units/boost/units/systems/derived_dimensions.hpp	(original)
+++ sandbox/units/boost/units/systems/derived_dimensions.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -16,30 +16,30 @@
 ///
 /// \detailed This file includes a number of common derived physical dimensions.
 
-#include <boost/units/systems/derived_dimensions/absorbed_dose_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/acceleration_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/action_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/activity_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/angular_velocity_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/area_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/dose_equivalent_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/dynamic_viscosity_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/energy_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/force_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/frequency_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/illuminance_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/kinematic_viscosity_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/luminance_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/luminous_flux_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/mass_density_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/momentum_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/power_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/pressure_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/specific_volume_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/stress_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/surface_density_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/velocity_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/volume_derived_dimension.hpp>
-#include <boost/units/systems/derived_dimensions/wavenumber_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/absorbed_dose.hpp>
+#include <boost/units/systems/physical_dimensions/acceleration.hpp>
+#include <boost/units/systems/physical_dimensions/action.hpp>
+#include <boost/units/systems/physical_dimensions/activity.hpp>
+#include <boost/units/systems/physical_dimensions/angular_velocity.hpp>
+#include <boost/units/systems/physical_dimensions/area.hpp>
+#include <boost/units/systems/physical_dimensions/dose_equivalent.hpp>
+#include <boost/units/systems/physical_dimensions/dynamic_viscosity.hpp>
+#include <boost/units/systems/physical_dimensions/energy.hpp>
+#include <boost/units/systems/physical_dimensions/force.hpp>
+#include <boost/units/systems/physical_dimensions/frequency.hpp>
+#include <boost/units/systems/physical_dimensions/illuminance.hpp>
+#include <boost/units/systems/physical_dimensions/kinematic_viscosity.hpp>
+#include <boost/units/systems/physical_dimensions/luminance.hpp>
+#include <boost/units/systems/physical_dimensions/luminous_flux.hpp>
+#include <boost/units/systems/physical_dimensions/mass_density.hpp>
+#include <boost/units/systems/physical_dimensions/momentum.hpp>
+#include <boost/units/systems/physical_dimensions/power.hpp>
+#include <boost/units/systems/physical_dimensions/pressure.hpp>
+#include <boost/units/systems/physical_dimensions/specific_volume.hpp>
+#include <boost/units/systems/physical_dimensions/stress.hpp>
+#include <boost/units/systems/physical_dimensions/surface_density.hpp>
+#include <boost/units/systems/physical_dimensions/velocity.hpp>
+#include <boost/units/systems/physical_dimensions/volume.hpp>
+#include <boost/units/systems/physical_dimensions/wavenumber.hpp>
 
 #endif // BOOST_UNITS_DERIVED_DIMENSIONS_HPP
Modified: sandbox/units/boost/units/systems/si/absorbed_dose.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/absorbed_dose.hpp	(original)
+++ sandbox/units/boost/units/systems/si/absorbed_dose.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_SI_ABSORBED_DOSE_HPP
 
 #include <boost/units/systems/si/base.hpp>
-#include <boost/units/systems/derived_dimensions/absorbed_dose_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/absorbed_dose.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/si/acceleration.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/acceleration.hpp	(original)
+++ sandbox/units/boost/units/systems/si/acceleration.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_SI_ACCELERATION_HPP
 
 #include <boost/units/systems/si/base.hpp>
-#include <boost/units/systems/derived_dimensions/acceleration_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/acceleration.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/si/action.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/action.hpp	(original)
+++ sandbox/units/boost/units/systems/si/action.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_SI_ACTION_HPP
 
 #include <boost/units/systems/si/base.hpp>
-#include <boost/units/systems/derived_dimensions/action_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/action.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/si/activity.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/activity.hpp	(original)
+++ sandbox/units/boost/units/systems/si/activity.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_SI_ACTIVITY_HPP
 
 #include <boost/units/systems/si/base.hpp>
-#include <boost/units/systems/derived_dimensions/activity_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/activity.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/si/angular_velocity.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/angular_velocity.hpp	(original)
+++ sandbox/units/boost/units/systems/si/angular_velocity.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_SI_ANGULAR_VELOCITY_HPP
 
 #include <boost/units/systems/si/base.hpp>
-#include <boost/units/systems/derived_dimensions/angular_velocity_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/angular_velocity.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/si/area.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/area.hpp	(original)
+++ sandbox/units/boost/units/systems/si/area.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_SI_AREA_HPP
 
 #include <boost/units/systems/si/base.hpp>
-#include <boost/units/systems/derived_dimensions/area_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/area.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/si/dose_equivalent.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/dose_equivalent.hpp	(original)
+++ sandbox/units/boost/units/systems/si/dose_equivalent.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_SI_DOSE_EQUIVALENT_HPP
 
 #include <boost/units/systems/si/base.hpp>
-#include <boost/units/systems/derived_dimensions/dose_equivalent_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/dose_equivalent.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/si/dynamic_viscosity.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/dynamic_viscosity.hpp	(original)
+++ sandbox/units/boost/units/systems/si/dynamic_viscosity.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_SI_DYNAMIC_VISCOSITY_HPP
 
 #include <boost/units/systems/si/base.hpp>
-#include <boost/units/systems/derived_dimensions/dynamic_viscosity_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/dynamic_viscosity.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/si/energy.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/energy.hpp	(original)
+++ sandbox/units/boost/units/systems/si/energy.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_SI_ENERGY_HPP
 
 #include <boost/units/systems/si/base.hpp>
-#include <boost/units/systems/derived_dimensions/energy_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/energy.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/si/force.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/force.hpp	(original)
+++ sandbox/units/boost/units/systems/si/force.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_SI_FORCE_HPP
 
 #include <boost/units/systems/si/base.hpp>
-#include <boost/units/systems/derived_dimensions/force_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/force.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/si/frequency.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/frequency.hpp	(original)
+++ sandbox/units/boost/units/systems/si/frequency.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_SI_FREQUENCY_HPP
 
 #include <boost/units/systems/si/base.hpp>
-#include <boost/units/systems/derived_dimensions/frequency_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/frequency.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/si/illuminance.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/illuminance.hpp	(original)
+++ sandbox/units/boost/units/systems/si/illuminance.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_SI_ILLUMINANCE_HPP
 
 #include <boost/units/systems/si/base.hpp>
-#include <boost/units/systems/derived_dimensions/illuminance_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/illuminance.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/si/kinematic_viscosity.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/kinematic_viscosity.hpp	(original)
+++ sandbox/units/boost/units/systems/si/kinematic_viscosity.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_SI_KINEMATIC_VISCOSITY_HPP
 
 #include <boost/units/systems/si/base.hpp>
-#include <boost/units/systems/derived_dimensions/kinematic_viscosity_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/kinematic_viscosity.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/si/luminous_flux.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/luminous_flux.hpp	(original)
+++ sandbox/units/boost/units/systems/si/luminous_flux.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_SI_LUMINOUS_FLUX_HPP
 
 #include <boost/units/systems/si/base.hpp>
-#include <boost/units/systems/derived_dimensions/luminous_flux_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/luminous_flux.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/si/mass_density.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/mass_density.hpp	(original)
+++ sandbox/units/boost/units/systems/si/mass_density.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_SI_MASS_DENSITY_HPP
 
 #include <boost/units/systems/si/base.hpp>
-#include <boost/units/systems/derived_dimensions/mass_density_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/mass_density.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/si/momentum.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/momentum.hpp	(original)
+++ sandbox/units/boost/units/systems/si/momentum.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_SI_MOMENTUM_HPP
 
 #include <boost/units/systems/si/base.hpp>
-#include <boost/units/systems/derived_dimensions/momentum_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/momentum.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/si/power.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/power.hpp	(original)
+++ sandbox/units/boost/units/systems/si/power.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_SI_POWER_HPP
 
 #include <boost/units/systems/si/base.hpp>
-#include <boost/units/systems/derived_dimensions/power_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/power.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/si/pressure.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/pressure.hpp	(original)
+++ sandbox/units/boost/units/systems/si/pressure.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_SI_PRESSURE_HPP
 
 #include <boost/units/systems/si/base.hpp>
-#include <boost/units/systems/derived_dimensions/pressure_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/pressure.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/si/surface_density.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/surface_density.hpp	(original)
+++ sandbox/units/boost/units/systems/si/surface_density.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_SI_SURFACE_DENSITY_HPP
 
 #include <boost/units/systems/si/base.hpp>
-#include <boost/units/systems/derived_dimensions/surface_density_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/surface_density.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/si/velocity.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/velocity.hpp	(original)
+++ sandbox/units/boost/units/systems/si/velocity.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_SI_VELOCITY_HPP
 
 #include <boost/units/systems/si/base.hpp>
-#include <boost/units/systems/derived_dimensions/velocity_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/velocity.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/si/volume.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/volume.hpp	(original)
+++ sandbox/units/boost/units/systems/si/volume.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_SI_VOLUME_HPP
 
 #include <boost/units/systems/si/base.hpp>
-#include <boost/units/systems/derived_dimensions/volume_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/volume.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/si/wavenumber.hpp
==============================================================================
--- sandbox/units/boost/units/systems/si/wavenumber.hpp	(original)
+++ sandbox/units/boost/units/systems/si/wavenumber.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -12,7 +12,7 @@
 #define BOOST_UNITS_SI_WAVENUMBER_HPP
 
 #include <boost/units/systems/si/base.hpp>
-#include <boost/units/systems/derived_dimensions/wavenumber_derived_dimension.hpp>
+#include <boost/units/systems/physical_dimensions/wavenumber.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/temperature/celsius.hpp
==============================================================================
--- sandbox/units/boost/units/systems/temperature/celsius.hpp	(original)
+++ sandbox/units/boost/units/systems/temperature/celsius.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -16,8 +16,7 @@
 #include <boost/units/absolute.hpp>
 #include <boost/units/static_constant.hpp>
 #include <boost/units/make_system.hpp>
-#include <boost/units/systems/physical_units.hpp>
-#include <boost/units/systems/base_units.hpp>
+#include <boost/units/systems/base_units/celsius_base_unit.hpp>
 
 namespace boost {
 
Modified: sandbox/units/boost/units/systems/temperature/fahrenheit.hpp
==============================================================================
--- sandbox/units/boost/units/systems/temperature/fahrenheit.hpp	(original)
+++ sandbox/units/boost/units/systems/temperature/fahrenheit.hpp	2007-05-31 16:09:43 EDT (Thu, 31 May 2007)
@@ -16,8 +16,7 @@
 #include <boost/units/absolute.hpp>
 #include <boost/units/io.hpp>
 #include <boost/units/static_constant.hpp>
-#include <boost/units/systems/physical_units.hpp>
-#include <boost/units/systems/base_unit.hpp>
+#include <boost/units/systems/base_units/fahrenheit_base_unit.hpp>
 
 namespace boost {