diff --git a/dumux/implicit/2p2cni/2p2cnifluxvariables.hh b/dumux/implicit/2p2cni/2p2cnifluxvariables.hh
index 9067622d04923b74a555e450ea34d6bb702bede9..e80056e1ef35b64a0fa04c5bcba8b31bd55f0863 100644
--- a/dumux/implicit/2p2cni/2p2cnifluxvariables.hh
+++ b/dumux/implicit/2p2cni/2p2cnifluxvariables.hh
@@ -30,6 +30,7 @@
 
 #include <dumux/common/math.hh>
 #include <dumux/implicit/2p2c/2p2cfluxvariables.hh>
+#include "2p2cniproperties.hh"
 
 namespace Dumux
 {
@@ -98,7 +99,7 @@ public:
      */
     DimVector temperatureGradient() const
     { return temperatureGrad_; }
-    
+
     /*!
      * \brief The harmonically averaged effective thermal conductivity.
      */
@@ -118,7 +119,7 @@ protected:
         {
             tmp = this->face().grad[idx];
 
-            // index for the element volume variables 
+            // index for the element volume variables
             int volVarsIdx = this->face().fapIndices[idx];
 
             tmp *= elemVolVars[volVarsIdx].temperature();
@@ -129,8 +130,7 @@ protected:
         calculateEffThermalConductivity_(problem, element, elemVolVars);
 
         // project the heat flux vector on the face's normal vector
-        normalMatrixHeatFlux_ = temperatureGrad_*
-                                this->face().normal;
+        normalMatrixHeatFlux_ = temperatureGrad_* this->face().normal;
         normalMatrixHeatFlux_ *= -lambdaEff_;
     }
 
@@ -139,17 +139,17 @@ protected:
                                           const ElementVolumeVariables &elemVolVars)
     {
         const Scalar lambdaI =
-                ThermalConductivityModel::effectiveThermalConductivity(element,
-                                                                       elemVolVars,
-                                                                       this->fvGeometry_,
-                                                                       problem.spatialParams(),
-                                                                       this->face().i);
+            ThermalConductivityModel::effectiveThermalConductivity(element,
+                                                                   elemVolVars,
+                                                                   this->fvGeometry_,
+                                                                   problem.spatialParams(),
+                                                                   this->face().i);
         const Scalar lambdaJ =
-                ThermalConductivityModel::effectiveThermalConductivity(element,
-                                                                       elemVolVars,
-                                                                       this->fvGeometry_,
-                                                                       problem.spatialParams(),
-                                                                       this->face().j);
+            ThermalConductivityModel::effectiveThermalConductivity(element,
+                                                                   elemVolVars,
+                                                                   this->fvGeometry_,
+                                                                   problem.spatialParams(),
+                                                                   this->face().j);
         // -> harmonic mean
         lambdaEff_ = harmonicMean(lambdaI, lambdaJ);
     }
diff --git a/dumux/implicit/2pni/2pnifluxvariables.hh b/dumux/implicit/2pni/2pnifluxvariables.hh
index 3c2ed188475262af9564ebfae1ef179749a7ea76..bec6a0294651392813dfbb965cc3d6393d65ce06 100644
--- a/dumux/implicit/2pni/2pnifluxvariables.hh
+++ b/dumux/implicit/2pni/2pnifluxvariables.hh
@@ -31,6 +31,8 @@
 #include <dumux/common/math.hh>
 #include <dumux/implicit/common/implicitdarcyfluxvariables.hh>
 
+#include "2pniproperties.hh"
+
 namespace Dumux
 {
 
@@ -77,11 +79,11 @@ public:
      */
 
     TwoPNIFluxVariables(const Problem &problem,
-                   const Element &element,
-                   const FVElementGeometry &fvGeometry,
-                   int faceIdx,
-                   const ElementVolumeVariables &elemVolVars,
-                   const bool onBoundary = false)
+                        const Element &element,
+                        const FVElementGeometry &fvGeometry,
+                        int faceIdx,
+                        const ElementVolumeVariables &elemVolVars,
+                        const bool onBoundary = false)
         : ParentType(problem, element, fvGeometry, faceIdx, elemVolVars, onBoundary)
     {
         faceIdx_ = faceIdx;
@@ -123,7 +125,7 @@ protected:
         {
             tmp = this->face().grad[idx];
 
-            // index for the element volume variables 
+            // index for the element volume variables
             int volVarsIdx = this->face().fapIndices[idx];
 
             tmp *= elemVolVars[volVarsIdx].temperature();
@@ -134,25 +136,26 @@ protected:
         calculateEffThermalConductivity_(problem, element, elemVolVars);
 
         // project the heat flux vector on the face's normal vector
-        normalMatrixHeatFlux_ = temperatureGrad_*
-                                this->face().normal;
+        normalMatrixHeatFlux_ = temperatureGrad_ * this->face().normal;
         normalMatrixHeatFlux_ *= -lambdaEff_;
     }
 
     void calculateEffThermalConductivity_(const Problem &problem,
-                                        const Element &element,
-                                        const ElementVolumeVariables &elemVolVars)
+                                          const Element &element,
+                                          const ElementVolumeVariables &elemVolVars)
     {
-        const Scalar lambdaI = ThermalConductivityModel::effectiveThermalConductivity(element,
-                                                                    elemVolVars,
-                                                                    this->fvGeometry_,
-                                                                    problem.spatialParams(),
-                                                                    this->face().i);
-        const Scalar lambdaJ = ThermalConductivityModel::effectiveThermalConductivity(element,
-                                                                    elemVolVars,
-                                                                    this->fvGeometry_,
-                                                                    problem.spatialParams(),
-                                                                    this->face().j);
+        const Scalar lambdaI =
+            ThermalConductivityModel::effectiveThermalConductivity(element,
+                                                                   elemVolVars,
+                                                                   this->fvGeometry_,
+                                                                   problem.spatialParams(),
+                                                                   this->face().i);
+        const Scalar lambdaJ =
+            ThermalConductivityModel::effectiveThermalConductivity(element,
+                                                                   elemVolVars,
+                                                                   this->fvGeometry_,
+                                                                   problem.spatialParams(),
+                                                                   this->face().j);
         // -> harmonic mean
         lambdaEff_ = harmonicMean(lambdaI, lambdaJ);
     }