diff --git a/dumux/material/fluidstates/nonequilibriumenergyfluidstate.hh b/dumux/material/fluidstates/nonequilibriumenergyfluidstate.hh
index 7893b57af133dbd2857fdcfc356a64f38f195048..50eed73aa874db2a16e50354be645920712bfbac 100644
--- a/dumux/material/fluidstates/nonequilibriumenergyfluidstate.hh
+++ b/dumux/material/fluidstates/nonequilibriumenergyfluidstate.hh
@@ -51,8 +51,8 @@ NEW_PROP_TAG(FluidSystem);
  */
 template <class TypeTag>
 class NonEquilibriumEnergyFluidState :
-    public NonEquilibriumFluidState<class GET_PROP_TYPE(TypeTag, Scalar),
-                                    class GET_PROP_TYPE(TypeTag, FluidSystem)>
+    public NonEquilibriumFluidState<typename GET_PROP_TYPE(TypeTag, Scalar),
+                                    typename GET_PROP_TYPE(TypeTag, FluidSystem)>
     {
         typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
         typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
diff --git a/dumux/material/fluidstates/nonequilibriummassfluidstate.hh b/dumux/material/fluidstates/nonequilibriummassfluidstate.hh
index a9619873cc6b6eee819a7e5c1e78e7b821b8b594..988902a374fca26e0b170a06792baeb1e612ed26 100644
--- a/dumux/material/fluidstates/nonequilibriummassfluidstate.hh
+++ b/dumux/material/fluidstates/nonequilibriummassfluidstate.hh
@@ -54,12 +54,12 @@ NEW_PROP_TAG(NumComponents);
  */
 template <class TypeTag>
 class NonEquilibriumMassFluidState :
-    public NonEquilibriumFluidState<class GET_PROP_TYPE(TypeTag, Scalar),
-                                    class GET_PROP_TYPE(TypeTag, FluidSystem)>
+    public NonEquilibriumFluidState<typename GET_PROP_TYPE(TypeTag, Scalar),
+                                    typename GET_PROP_TYPE(TypeTag, FluidSystem)>
     {
     public:
-        typedef NonEquilibriumFluidState<class GET_PROP_TYPE(TypeTag, Scalar),
-                                          class GET_PROP_TYPE(TypeTag, FluidSystem)> ParentType;
+        typedef NonEquilibriumFluidState<typename GET_PROP_TYPE(TypeTag, Scalar),
+                                         typename GET_PROP_TYPE(TypeTag, FluidSystem)> ParentType;
 
         typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
         typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;