diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index 961c2d895..16103e3ef 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -98,6 +98,7 @@ list (APPEND PUBLIC_HEADER_FILES
 	opm/autodiff/BlackoilModel.hpp
 	opm/autodiff/BlackoilModelBase.hpp
 	opm/autodiff/BlackoilModelBase_impl.hpp
+	opm/autodiff/BlackoilModelEnums.hpp
 	opm/autodiff/BlackoilModelParameters.hpp
 	opm/autodiff/BlackoilPropsAdFromDeck.hpp
 	opm/autodiff/BlackoilPropsAdInterface.hpp
diff --git a/opm/autodiff/BlackoilModelBase.hpp b/opm/autodiff/BlackoilModelBase.hpp
index 067dc6e4f..1068163c4 100644
--- a/opm/autodiff/BlackoilModelBase.hpp
+++ b/opm/autodiff/BlackoilModelBase.hpp
@@ -30,6 +30,7 @@
 #include <opm/autodiff/BlackoilPropsAdInterface.hpp>
 #include <opm/autodiff/LinearisedBlackoilResidual.hpp>
 #include <opm/autodiff/NewtonIterationBlackoilInterface.hpp>
+#include <opm/autodiff/BlackoilModelEnums.hpp>
 
 #include <array>
 
@@ -225,13 +226,6 @@ namespace Opm {
             M p2w;              // perf -> well (gather)
         };
 
-        enum { Water        = BlackoilPropsAdInterface::Water,
-               Oil          = BlackoilPropsAdInterface::Oil  ,
-               Gas          = BlackoilPropsAdInterface::Gas  ,
-               MaxNumPhases = BlackoilPropsAdInterface::MaxNumPhases
-         };
-
-        enum PrimalVariables { Sg = 0, RS = 1, RV = 2 };
 
         // ---------  Data members  ---------
 
diff --git a/opm/autodiff/BlackoilModelEnums.hpp b/opm/autodiff/BlackoilModelEnums.hpp
new file mode 100644
index 000000000..89cf13ace
--- /dev/null
+++ b/opm/autodiff/BlackoilModelEnums.hpp
@@ -0,0 +1,44 @@
+/*
+  Copyright 2015 SINTEF ICT, Applied Mathematics.
+
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef OPM_BLACKOILMODELENUMS_HEADER_INCLUDED
+#define OPM_BLACKOILMODELENUMS_HEADER_INCLUDED
+
+#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
+
+namespace Opm
+{
+
+    enum Phases {
+        Water        = BlackoilPropsAdInterface::Water,
+        Oil          = BlackoilPropsAdInterface::Oil  ,
+        Gas          = BlackoilPropsAdInterface::Gas  ,
+        MaxNumPhases = BlackoilPropsAdInterface::MaxNumPhases
+    };
+
+    enum PrimalVariables {
+        Sg = 0,
+        RS = 1,
+        RV = 2
+    };
+
+
+} // namespace Opm
+
+#endif // OPM_BLACKOILMODELENUMS_HEADER_INCLUDED