Cleaned up includes

Removed includes to cvfLibCore and friends. Removed several includes from header files.

ApplicationCode/FileInterface/RifEclipseInputFileTools.h

@@ -22,7 +22,7 @@
 
 #include "cvfBase.h"
 #include "cvfObject.h"
-#include "cvfLibCore.h"
+#include "cvfCollection.h"
 
 #include "RifReaderInterface.h"
 #include "RigFault.h"

ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp

@@ -26,10 +26,13 @@
 
 #include "cafProgressInfo.h"
 
+#include "cvfMath.h"
+
 #include <QFileInfo>
 #include <QDebug>
 
 #include <assert.h>
+#include <algorithm>
 
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/FileInterface/RifEclipseOutputFileTools.h

@@ -22,7 +22,6 @@
 
 #include "cvfBase.h"
 #include "cvfObject.h"
-#include "cvfLibCore.h"
 
 #include "RifReaderInterface.h"
 #include "RifEclipseRestartDataAccess.h"

ApplicationCode/FileInterface/RifEclipseRestartDataAccess.h

@@ -22,7 +22,6 @@
 
 #include "cvfBase.h"
 #include "cvfObject.h"
-#include "cvfLibCore.h"
 
 #include <QStringList>
 #include <QDateTime>

ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp

@@ -20,25 +20,28 @@
 
 #include "RifReaderEclipseOutput.h"
 
-#include "RigActiveCellInfo.h"
-#include "RigCaseCellResultsData.h"
-#include "RigEclipseCaseData.h"
-#include "RigMainGrid.h"
-
+#include "RifEclipseInputFileTools.h"
 #include "RifEclipseOutputFileTools.h"
 #include "RifEclipseRestartFilesetAccess.h"
 #include "RifEclipseUnifiedRestartFileAccess.h"
 #include "RifReaderOpmParserInput.h"
 
+#include "RigActiveCellInfo.h"
+#include "RigCaseCellResultsData.h"
+#include "RigEclipseCaseData.h"
+#include "RigMainGrid.h"
+#include "RigSingleWellResultsData.h"
+
 #include "cafProgressInfo.h"
 
-#include "ert/ecl/ecl_nnc_export.h"
-#include "ert/ecl/ecl_kw_magic.h"
+#include "cvfTrace.h"
 
+#include "ert/ecl/ecl_kw_magic.h"
+#include "ert/ecl/ecl_nnc_export.h"
+
+#include <cmath> // Needed for HUGE_VAL on Linux
 #include <iostream>
 #include <map>
-#include <cmath> // Needed for HUGE_VAL on Linux
-#include "RifEclipseInputFileTools.h"
 
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/FileInterface/RifReaderEclipseOutput.h

@@ -22,8 +22,7 @@
 
 #include "RifReaderInterface.h"
 
-#include "RigFault.h"
-#include "RigSingleWellResultsData.h"
+#include "cvfCollection.h"
 
 #include <QList>
 #include <QDateTime>
@@ -33,6 +32,9 @@ class RifEclipseRestartDataAccess;
 class RigGridBase;
 class RigMainGrid;
 class RigActiveCellInfo;
+class RigFault;
+
+struct RigWellResultPoint;
 
 typedef struct ecl_grid_struct ecl_grid_type;
 typedef struct ecl_file_struct ecl_file_type;

ApplicationCode/FileInterface/RifReaderInterface.h

@@ -22,7 +22,6 @@
 
 #include "cvfBase.h"
 #include "cvfObject.h"
-#include "cvfLibCore.h"
 
 #include "cafPdmPointer.h"
 
@@ -30,6 +29,8 @@
 #include <QStringList>
 #include <QDateTime>
 
+#include <vector>
+
 
 class RigEclipseCaseData;
 class RifReaderSettings;