diff --git a/examples/polymer_reorder.cpp b/examples/polymer_reorder.cpp
index a0942daee..b15d1d973 100644
--- a/examples/polymer_reorder.cpp
+++ b/examples/polymer_reorder.cpp
@@ -28,7 +28,7 @@
 #include <opm/core/grid.h>
 #include <opm/core/GridManager.hpp>
 #include <opm/core/newwells.h>
-#include <opm/core/WellsManager.hpp>
+#include <opm/core/wells/WellsManager.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <opm/core/utility/initState.hpp>
 #include <opm/core/utility/SimulatorTimer.hpp>
@@ -53,7 +53,7 @@
 #include <opm/core/transport/CSRMatrixBlockAssembler.hpp>
 #include <opm/core/transport/SinglePointUpwindTwoPhase.hpp>
 
-#include <opm/core/ColumnExtract.hpp>
+#include <opm/core/utility/ColumnExtract.hpp>
 
 #include <opm/polymer/PolymerState.hpp>
 #include <opm/polymer/SinglePointUpwindTwoPhasePolymer.hpp>
diff --git a/opm/polymer/PolymerState.hpp b/opm/polymer/PolymerState.hpp
index 99488abe3..de09c5f36 100644
--- a/opm/polymer/PolymerState.hpp
+++ b/opm/polymer/PolymerState.hpp
@@ -21,7 +21,7 @@
 #define OPM_POLYMERSTATE_HEADER_INCLUDED
 
 
-#include <opm/core/TwophaseState.hpp>
+#include <opm/core/simulator/TwophaseState.hpp>
 #include <opm/core/grid.h>
 #include <vector>