diff --git a/include/boost/units/systems/si.hpp b/include/boost/units/systems/si.hpp
index 727982b4..0166ad83 100644
--- a/include/boost/units/systems/si.hpp
+++ b/include/boost/units/systems/si.hpp
@@ -40,13 +40,16 @@
 #include <boost/units/systems/si/electric_charge.hpp>
 #include <boost/units/systems/si/electric_potential.hpp>
 #include <boost/units/systems/si/energy.hpp>
+#include <boost/units/systems/si/energy_density.hpp>
 #include <boost/units/systems/si/force.hpp>
 #include <boost/units/systems/si/frequency.hpp>
+#include <boost/units/systems/si/heat_capacity.hpp>
 #include <boost/units/systems/si/illuminance.hpp>
 #include <boost/units/systems/si/impedance.hpp>
 #include <boost/units/systems/si/inductance.hpp>
 #include <boost/units/systems/si/kinematic_viscosity.hpp>
 #include <boost/units/systems/si/length.hpp>
+#include <boost/units/systems/si/luminance.hpp>
 #include <boost/units/systems/si/luminous_flux.hpp>
 #include <boost/units/systems/si/luminous_intensity.hpp>
 #include <boost/units/systems/si/magnetic_field_intensity.hpp>
@@ -54,6 +57,8 @@
 #include <boost/units/systems/si/magnetic_flux_density.hpp>
 #include <boost/units/systems/si/mass.hpp>
 #include <boost/units/systems/si/mass_density.hpp>
+#include <boost/units/systems/si/molar_energy.hpp>
+#include <boost/units/systems/si/molar_heat_capacity.hpp>
 #include <boost/units/systems/si/moment_of_inertia.hpp>
 #include <boost/units/systems/si/momentum.hpp>
 #include <boost/units/systems/si/permeability.hpp>
@@ -65,9 +70,14 @@
 #include <boost/units/systems/si/resistance.hpp>
 #include <boost/units/systems/si/resistivity.hpp>
 #include <boost/units/systems/si/solid_angle.hpp>
+#include <boost/units/systems/si/specific_energy.hpp>
+#include <boost/units/systems/si/specific_heat_capacity.hpp>
+#include <boost/units/systems/si/specific_volume.hpp>
+#include <boost/units/systems/si/stress.hpp>
 #include <boost/units/systems/si/surface_density.hpp>
 #include <boost/units/systems/si/surface_tension.hpp>
 #include <boost/units/systems/si/temperature.hpp>
+#include <boost/units/systems/si/thermal_conductivity.hpp>
 #include <boost/units/systems/si/time.hpp>
 #include <boost/units/systems/si/torque.hpp>
 #include <boost/units/systems/si/velocity.hpp>
diff --git a/include/boost/units/systems/si/energy_density.hpp b/include/boost/units/systems/si/energy_density.hpp
new file mode 100644
index 00000000..a3500911
--- /dev/null
+++ b/include/boost/units/systems/si/energy_density.hpp
@@ -0,0 +1,30 @@
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// unit/quantity manipulation and conversion
+//
+// Copyright (C) 2018 Eisuke Kawashima
+//
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_UNITS_SI_ENERGY_DENSITY_HPP
+#define BOOST_UNITS_SI_ENERGY_DENSITY_HPP
+
+#include <boost/units/systems/si/base.hpp>
+#include <boost/units/physical_dimensions/energy_density.hpp>
+
+namespace boost {
+
+namespace units {
+
+namespace si {
+
+typedef unit<energy_density_dimension,si::system> energy_density;
+
+} // namespace si
+
+} // namespace units
+
+} // namespace boost
+
+#endif // BOOST_UNITS_SI_ENERGY_DENSITY_HPP
diff --git a/include/boost/units/systems/si/heat_capacity.hpp b/include/boost/units/systems/si/heat_capacity.hpp
new file mode 100644
index 00000000..4a4866e3
--- /dev/null
+++ b/include/boost/units/systems/si/heat_capacity.hpp
@@ -0,0 +1,30 @@
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// unit/quantity manipulation and conversion
+//
+// Copyright (C) 2018 Eisuke Kawashima
+//
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_UNITS_SI_HEAT_CAPACITY_HPP
+#define BOOST_UNITS_SI_HEAT_CAPACITY_HPP
+
+#include <boost/units/systems/si/base.hpp>
+#include <boost/units/physical_dimensions/heat_capacity.hpp>
+
+namespace boost {
+
+namespace units {
+
+namespace si {
+
+typedef unit<heat_capacity_dimension,si::system> heat_capacity;
+
+} // namespace si
+
+} // namespace units
+
+} // namespace boost
+
+#endif // BOOST_UNITS_SI_HEAT_CAPACITY_HPP
diff --git a/include/boost/units/systems/si/luminance.hpp b/include/boost/units/systems/si/luminance.hpp
new file mode 100644
index 00000000..c2dec1cf
--- /dev/null
+++ b/include/boost/units/systems/si/luminance.hpp
@@ -0,0 +1,30 @@
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// unit/quantity manipulation and conversion
+//
+// Copyright (C) 2018 Eisuke Kawashima
+//
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_UNITS_SI_LUMINANCE_HPP
+#define BOOST_UNITS_SI_LUMINANCE_HPP
+
+#include <boost/units/systems/si/base.hpp>
+#include <boost/units/physical_dimensions/luminance.hpp>
+
+namespace boost {
+
+namespace units {
+
+namespace si {
+
+typedef unit<luminance_dimension,si::system> luminance;
+
+} // namespace si
+
+} // namespace units
+
+} // namespace boost
+
+#endif // BOOST_UNITS_SI_LUMINANCE_HPP
diff --git a/include/boost/units/systems/si/molar_energy.hpp b/include/boost/units/systems/si/molar_energy.hpp
new file mode 100644
index 00000000..bcf338ff
--- /dev/null
+++ b/include/boost/units/systems/si/molar_energy.hpp
@@ -0,0 +1,30 @@
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// unit/quantity manipulation and conversion
+//
+// Copyright (C) 2018 Eisuke Kawashima
+//
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_UNITS_SI_MOLAR_ENERGY_HPP
+#define BOOST_UNITS_SI_MOLAR_ENERGY_HPP
+
+#include <boost/units/systems/si/base.hpp>
+#include <boost/units/physical_dimensions/molar_energy.hpp>
+
+namespace boost {
+
+namespace units {
+
+namespace si {
+
+typedef unit<molar_energy_dimension,si::system> molar_energy;
+
+} // namespace si
+
+} // namespace units
+
+} // namespace boost
+
+#endif // BOOST_UNITS_SI_MOLAR_ENERGY_HPP
diff --git a/include/boost/units/systems/si/molar_heat_capacity.hpp b/include/boost/units/systems/si/molar_heat_capacity.hpp
new file mode 100644
index 00000000..7f4b5d17
--- /dev/null
+++ b/include/boost/units/systems/si/molar_heat_capacity.hpp
@@ -0,0 +1,30 @@
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// unit/quantity manipulation and conversion
+//
+// Copyright (C) 2018 Eisuke Kawashima
+//
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_UNITS_SI_MOLAR_HEAT_CAPACITY_HPP
+#define BOOST_UNITS_SI_MOLAR_HEAT_CAPACITY_HPP
+
+#include <boost/units/systems/si/base.hpp>
+#include <boost/units/physical_dimensions/molar_heat_capacity.hpp>
+
+namespace boost {
+
+namespace units {
+
+namespace si {
+
+typedef unit<molar_heat_capacity_dimension,si::system> molar_heat_capacity;
+
+} // namespace si
+
+} // namespace units
+
+} // namespace boost
+
+#endif // BOOST_UNITS_SI_MOLAR_HEAT_CAPACITY_HPP
diff --git a/include/boost/units/systems/si/specific_energy.hpp b/include/boost/units/systems/si/specific_energy.hpp
new file mode 100644
index 00000000..6e4f4cc2
--- /dev/null
+++ b/include/boost/units/systems/si/specific_energy.hpp
@@ -0,0 +1,30 @@
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// unit/quantity manipulation and conversion
+//
+// Copyright (C) 2018 Eisuke Kawashima
+//
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_UNITS_SI_SPECIFIC_ENERGY_HPP
+#define BOOST_UNITS_SI_SPECIFIC_ENERGY_HPP
+
+#include <boost/units/systems/si/base.hpp>
+#include <boost/units/physical_dimensions/specific_energy.hpp>
+
+namespace boost {
+
+namespace units {
+
+namespace si {
+
+typedef unit<specific_energy_dimension,si::system> specific_energy;
+
+} // namespace si
+
+} // namespace units
+
+} // namespace boost
+
+#endif // BOOST_UNITS_SI_SPECIFIC_ENERGY_HPP
diff --git a/include/boost/units/systems/si/specific_heat_capacity.hpp b/include/boost/units/systems/si/specific_heat_capacity.hpp
new file mode 100644
index 00000000..0b8d5282
--- /dev/null
+++ b/include/boost/units/systems/si/specific_heat_capacity.hpp
@@ -0,0 +1,30 @@
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// unit/quantity manipulation and conversion
+//
+// Copyright (C) 2018 Eisuke Kawashima
+//
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_UNITS_SI_SPECIFIC_HEAT_CAPACITY_HPP
+#define BOOST_UNITS_SI_SPECIFIC_HEAT_CAPACITY_HPP
+
+#include <boost/units/systems/si/base.hpp>
+#include <boost/units/physical_dimensions/specific_heat_capacity.hpp>
+
+namespace boost {
+
+namespace units {
+
+namespace si {
+
+typedef unit<specific_heat_capacity_dimension,si::system> specific_heat_capacity;
+
+} // namespace si
+
+} // namespace units
+
+} // namespace boost
+
+#endif // BOOST_UNITS_SI_SPECIFIC_HEAT_CAPACITY_HPP
diff --git a/include/boost/units/systems/si/specific_volume.hpp b/include/boost/units/systems/si/specific_volume.hpp
new file mode 100644
index 00000000..0ba4891c
--- /dev/null
+++ b/include/boost/units/systems/si/specific_volume.hpp
@@ -0,0 +1,30 @@
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// unit/quantity manipulation and conversion
+//
+// Copyright (C) 2018 Eisuke Kawashima
+//
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_UNITS_SI_SPECIFIC_VOLUME_HPP
+#define BOOST_UNITS_SI_SPECIFIC_VOLUME_HPP
+
+#include <boost/units/systems/si/base.hpp>
+#include <boost/units/physical_dimensions/specific_volume.hpp>
+
+namespace boost {
+
+namespace units {
+
+namespace si {
+
+typedef unit<specific_volume_dimension,si::system> specific_volume;
+
+} // namespace si
+
+} // namespace units
+
+} // namespace boost
+
+#endif // BOOST_UNITS_SI_SPECIFIC_VOLUME_HPP
diff --git a/include/boost/units/systems/si/stress.hpp b/include/boost/units/systems/si/stress.hpp
new file mode 100644
index 00000000..9fb27c03
--- /dev/null
+++ b/include/boost/units/systems/si/stress.hpp
@@ -0,0 +1,30 @@
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// unit/quantity manipulation and conversion
+//
+// Copyright (C) 2018 Eisuke Kawashima
+//
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_UNITS_SI_STRESS_HPP
+#define BOOST_UNITS_SI_STRESS_HPP
+
+#include <boost/units/systems/si/base.hpp>
+#include <boost/units/physical_dimensions/stress.hpp>
+
+namespace boost {
+
+namespace units {
+
+namespace si {
+
+typedef unit<stress_dimension,si::system> stress;
+
+} // namespace si
+
+} // namespace units
+
+} // namespace boost
+
+#endif // BOOST_UNITS_SI_STRESS_HPP
diff --git a/include/boost/units/systems/si/thermal_conductivity.hpp b/include/boost/units/systems/si/thermal_conductivity.hpp
new file mode 100644
index 00000000..bb889c8c
--- /dev/null
+++ b/include/boost/units/systems/si/thermal_conductivity.hpp
@@ -0,0 +1,30 @@
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// unit/quantity manipulation and conversion
+//
+// Copyright (C) 2018 Eisuke Kawashima
+//
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_UNITS_SI_THERMAL_CONDUCTIVITY_HPP
+#define BOOST_UNITS_SI_THERMAL_CONDUCTIVITY_HPP
+
+#include <boost/units/systems/si/base.hpp>
+#include <boost/units/physical_dimensions/thermal_conductivity.hpp>
+
+namespace boost {
+
+namespace units {
+
+namespace si {
+
+typedef unit<thermal_conductivity_dimension,si::system> thermal_conductivity;
+
+} // namespace si
+
+} // namespace units
+
+} // namespace boost
+
+#endif // BOOST_UNITS_SI_THERMAL_CONDUCTIVITY_HPP