diff --git a/opm/core/props/IncompPropertiesSinglePhase.cpp b/opm/core/props/IncompPropertiesSinglePhase.cpp
index 4790f7f2f..b860bd73f 100644
--- a/opm/core/props/IncompPropertiesSinglePhase.cpp
+++ b/opm/core/props/IncompPropertiesSinglePhase.cpp
@@ -25,6 +25,8 @@
 #include <opm/core/utility/Units.hpp>
 #include <opm/common/ErrorMacros.hpp>
 
+#include <opm/parser/eclipse/Deck/DeckItem.hpp>
+#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/parser/eclipse/Deck/DeckRecord.hpp>
 
 namespace Opm
diff --git a/opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp b/opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp
index 3ebe16fbb..2428cc65e 100644
--- a/opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp
+++ b/opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp
@@ -24,6 +24,8 @@
 #include <opm/core/utility/Units.hpp>
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/core/props/BlackoilPhases.hpp>
+#include <opm/parser/eclipse/Deck/DeckItem.hpp>
+#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/parser/eclipse/Deck/DeckRecord.hpp>
 
 
diff --git a/tests/test_pinchprocessor.cpp b/tests/test_pinchprocessor.cpp
index 96163299e..aeeff61de 100644
--- a/tests/test_pinchprocessor.cpp
+++ b/tests/test_pinchprocessor.cpp
@@ -41,6 +41,7 @@
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/GridProperty.hpp>
+#include <opm/parser/eclipse/EclipseState/Grid/TransMult.hpp>
 #include <opm/core/pressure/tpfa/TransTpfa.hpp>
 #include <opm/core/grid/PinchProcessor.hpp>
 #include <opm/core/props/rock/RockFromDeck.hpp>
diff --git a/tests/test_wellcollection.cpp b/tests/test_wellcollection.cpp
index 76697655d..ac6e49341 100644
--- a/tests/test_wellcollection.cpp
+++ b/tests/test_wellcollection.cpp
@@ -41,9 +41,9 @@ using namespace Opm;
 
 BOOST_AUTO_TEST_CASE(AddWellsAndGroupToCollection) {
     ParserPtr parser(new Parser());
-    boost::filesystem::path scheduleFile("wells_group.data");
+    std::string scheduleFile("wells_group.data");
     ParseMode parseMode;
-    DeckConstPtr deck =  parser->parseFile(scheduleFile.string() , parseMode);
+    DeckConstPtr deck =  parser->parseFile(scheduleFile, parseMode);
     EclipseStateConstPtr eclipseState(new EclipseState(deck, parseMode));
     PhaseUsage pu = phaseUsageFromDeck(eclipseState);
 
diff --git a/tests/test_wellsgroup.cpp b/tests/test_wellsgroup.cpp
index deb7c632b..8f9a76ee5 100644
--- a/tests/test_wellsgroup.cpp
+++ b/tests/test_wellsgroup.cpp
@@ -49,9 +49,9 @@ using namespace Opm;
 
 BOOST_AUTO_TEST_CASE(ConstructGroupFromWell) {
     ParserPtr parser(new Parser());
-    boost::filesystem::path scheduleFile("wells_group.data");
+    std::string scheduleFile("wells_group.data");
     ParseMode parseMode;
-    DeckConstPtr deck =  parser->parseFile(scheduleFile.string() , parseMode);
+    DeckConstPtr deck =  parser->parseFile(scheduleFile, parseMode);
     EclipseStateConstPtr eclipseState(new EclipseState(deck , parseMode));
     PhaseUsage pu = phaseUsageFromDeck(eclipseState);
 
@@ -83,8 +83,8 @@ BOOST_AUTO_TEST_CASE(ConstructGroupFromWell) {
 BOOST_AUTO_TEST_CASE(ConstructGroupFromGroup) {
     ParserPtr parser(new Parser());
     ParseMode parseMode;
-    boost::filesystem::path scheduleFile("wells_group.data");
-    DeckConstPtr deck =  parser->parseFile(scheduleFile.string() , parseMode);
+    std::string scheduleFile("wells_group.data");
+    DeckConstPtr deck =  parser->parseFile(scheduleFile, parseMode);
     EclipseStateConstPtr eclipseState(new EclipseState(deck , parseMode));
     PhaseUsage pu = phaseUsageFromDeck(eclipseState);