diff --git a/Makefile.am b/Makefile.am
index 30ce198d..eff335f2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,10 +67,20 @@ opm/core/eclipse/EclipseGridParser.hpp                  \
 opm/core/eclipse/EclipseGridParserHelpers.hpp           \
 opm/core/eclipse/EclipseUnits.hpp                       \
 opm/core/eclipse/SpecialEclipseFields.hpp               \
+opm/core/fluid/BlackoilFluid.hpp                        \
+opm/core/fluid/SimpleFluid2p.hpp                        \
+opm/core/fluid/blackoil/BlackoilDefs.hpp                \
+opm/core/fluid/blackoil/BlackoilPVT.hpp                 \
+opm/core/fluid/blackoil/FluidMatrixInteractionBlackoil.hpp \
+opm/core/fluid/blackoil/FluidStateBlackoil.hpp          \
+opm/core/fluid/blackoil/MiscibilityDead.hpp             \
+opm/core/fluid/blackoil/MiscibilityLiveGas.hpp          \
+opm/core/fluid/blackoil/MiscibilityLiveOil.hpp          \
+opm/core/fluid/blackoil/MiscibilityProps.hpp            \
+opm/core/fluid/blackoil/MiscibilityWater.hpp            \
 opm/core/utility/Average.hpp                            \
 opm/core/utility/ErrorMacros.hpp                        \
 opm/core/utility/Factory.hpp                            \
-opm/core/utility/linInt.hpp                             \
 opm/core/utility/MonotCubicInterpolator.hpp             \
 opm/core/utility/parameters/Parameter.hpp               \
 opm/core/utility/parameters/ParameterGroup.hpp          \
@@ -84,7 +94,11 @@ opm/core/utility/RootFinders.hpp                        \
 opm/core/utility/SparseTable.hpp                        \
 opm/core/utility/SparseVector.hpp                       \
 opm/core/utility/StopWatch.hpp                          \
+opm/core/utility/UniformTableLinear.hpp                 \
 opm/core/utility/Units.hpp                              \
+opm/core/utility/buildUniformMonotoneTable.hpp          \
+opm/core/utility/linInt.hpp                             \
+opm/core/utility/linearInterpolation.hpp                \
 opm/core/utility/cpgpreprocess/readvector.hpp           \
 opm/core/utility/cpgpreprocess/uniquepoints.h           \
 opm/core/utility/cpgpreprocess/preprocess.h             \
@@ -98,7 +112,6 @@ opm/core/utility/cart_grid.h                            \
 opm/core/well.h                                         \
 opm/core/linalg/sparse_sys.h                            \
 opm/core/linalg/blas_lapack.h                           \
-opm/core/fluid/SimpleFluid2p.hpp                        \
 opm/core/grid.h                                         \
 opm/core/GridAdapter.hpp                                \
 opm/core/pressure/fsh.h                                 \