Removed #include <opm/core/well_controls.h> from wells.h and inserted explicit #include <opm/core/well_controls.h> where needed.

opm/core/pressure/tpfa/cfs_tpfa_residual.c

@@ -5,6 +5,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define HAVE_WELLCONTROLS
 #include <opm/core/wells.h>
 #include <opm/core/well_controls.h>
 #include <opm/core/linalg/blas_lapack.h>

opm/core/pressure/tpfa/ifs_tpfa.c

@@ -8,6 +8,7 @@
 #include <opm/core/linalg/sparse_sys.h>
 
 #include <opm/core/wells.h>
+#include <opm/core/well_controls.h>
 #include <opm/core/pressure/flow_bc.h>
 #include <opm/core/pressure/tpfa/ifs_tpfa.h>
 

opm/core/well_controls.h

@@ -56,6 +56,7 @@ extern "C" {
  * value for the well.
  */
 
+//#ifdef HAVE_WELLCONTROLS
 struct WellControls
 {
     /**
@@ -91,6 +92,9 @@ struct WellControls
     */
     int cpty;
 };
+//#else
+//struct WellControls;
+//#endif
 
 bool 
 well_controls_equal(const struct WellControls *ctrls1, const struct WellControls *ctrls2);

opm/core/wells.h

@@ -22,7 +22,6 @@
 
 #include <stdbool.h>
 #include <opm/core/well_control_type.h>
-#include <opm/core/well_controls.h>
 
 /**
  * \file
@@ -46,7 +45,7 @@ enum WellType {
 
 
 
-
+struct WellControls;
 /**
  *  Data structure aggregating static information about all wells in a scenario.
  */

opm/core/wells/WellsManager.cpp

@@ -22,6 +22,7 @@
 #include <opm/core/io/eclipse/EclipseGridParser.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/wells.h>
+#include <opm/core/well_controls.h>
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <opm/core/utility/Units.hpp>
 #include <opm/core/wells/WellCollection.hpp>

tests/test_wells.cpp

@@ -29,6 +29,7 @@
 #include <boost/test/unit_test.hpp>
 
 #include <opm/core/wells.h>
+#include <opm/core/well_controls.h>
 
 #include <iostream>
 #include <vector>

tests/test_wellsmanager.cpp

@@ -28,6 +28,9 @@
 #define BOOST_TEST_MODULE WellsManagerTests
 #include <boost/test/unit_test.hpp>
 #include <opm/core/wells/WellsManager.hpp>
+#include <opm/core/wells.h>
+#include <opm/core/well_controls.h>
+
 #include <opm/core/io/eclipse/EclipseGridParser.hpp>
 #include <opm/core/grid/GridManager.hpp>