Moved include_directory from main to ApplicationCode. Include of Eclipse hearder files must now be prefixed with ert/<module_name>

ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp

@@ -38,10 +38,8 @@
 #include <QTextStream>
 #include <QDebug>
 
-#include "ecl_grid.h"
-#include "util.h"
-#include "well_state.h"
-
+#include "ert/ecl/ecl_box.h"
+#include "ert/ecl/ecl_kw.h"
 
 QString includeKeyword("INCLUDE");
 QString faultsKeyword("FAULTS");

ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp

@@ -20,11 +20,9 @@
 
 #include "RifEclipseOutputFileTools.h"
 
-#include "util.h"
-#include "ecl_file.h"
-#include "ecl_kw_magic.h"
-#include "ecl_grid.h"
-#include "ecl_rsthead.h"
+#include "ert/ecl/ecl_file.h"
+#include "ert/ecl/ecl_grid.h"
+#include "ert/ecl/ecl_kw_magic.h"
 
 #include "cafProgressInfo.h"
 

ApplicationCode/FileInterface/RifEclipseOutputFileTools.h

@@ -29,7 +29,7 @@
 #include <QDateTime>
 #include "RifReaderInterface.h"
 
-#include "ecl_util.h"
+#include "ert/ecl/ecl_util.h"
 
 typedef struct ecl_file_struct ecl_file_type;
 

ApplicationCode/FileInterface/RifEclipseRestartDataAccess.h

@@ -29,7 +29,7 @@
 
 #include <vector>
 
-#include "well_info.h"
+#include "ert/ecl_well/well_info.h"
 
 #include "RifReaderInterface.h"
 

ApplicationCode/FileInterface/RifEclipseSummaryTools.cpp

@@ -20,7 +20,7 @@
 
 #include "RifReaderEclipseSummary.h"
 
-#include "ecl_util.h"
+#include "ert/ecl/ecl_util.h"
 
 #include <iostream>
 

ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.cpp

@@ -21,11 +21,8 @@
 #include "RifEclipseUnifiedRestartFileAccess.h"
 #include "RifEclipseOutputFileTools.h"
 
-#include "ecl_kw_magic.h"
-#include <well_state.h>
-#include <well_info.h>
-#include <well_conn.h>
-#include <well_ts.h>
+#include "ert/ecl/ecl_file.h"
+#include "ert/ecl/ecl_kw_magic.h"
 
 //--------------------------------------------------------------------------------------------------
 /// Constructor

ApplicationCode/FileInterface/RifEclipseUnifiedRestartFileAccess.h

@@ -26,7 +26,7 @@ class RifEclipseOutputFileTools;
 
 //typedef struct ecl_file_struct ecl_file_type;
 
-#include "well_info.h"
+#include "ert/ecl_well/well_info.h"
 
 //==================================================================================================
 //

ApplicationCode/FileInterface/RifReaderEclipseInput.cpp

@@ -18,23 +18,10 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "cvfBase.h"
-
-#include "RigMainGrid.h"
-#include "RigCaseData.h"
-#include "RigCaseCellResultsData.h"
-
 #include "RifReaderEclipseInput.h"
-#include "RifReaderEclipseOutput.h"
 
 #include "RifEclipseInputFileTools.h"
-
-#include <iostream>
-#include <cmath>
-
-#include "ecl_grid.h"
-#include "well_state.h"
-#include "util.h"
+#include "RigCaseData.h"
 
 //==================================================================================================
 //

ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp

@@ -32,10 +32,8 @@
 
 #include "cafProgressInfo.h"
 
-#include "ecl_grid.h"
-#include "well_state.h"
-#include "ecl_kw_magic.h"
-#include "ecl_nnc_export.h"
+#include "ert/ecl/ecl_nnc_export.h"
+#include "ert/ecl/ecl_kw_magic.h"
 
 #include <iostream>
 #include <map>

ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp

@@ -18,7 +18,7 @@
 
 #include "RifReaderEclipseSummary.h"
 
-#include "ecl_sum.h"
+#include "ert/ecl/ecl_sum.h"
 
 #include <string>
 #include <assert.h>