diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp
index 79b9a501bf..61862f5b8c 100644
--- a/ApplicationCode/Application/RiaApplication.cpp
+++ b/ApplicationCode/Application/RiaApplication.cpp
@@ -39,6 +39,7 @@
 #include "RimWellPathCollection.h"
 #include "RimOilField.h"
 #include "RimAnalysisModels.h"
+#include "RimFaultCollection.h"
 
 #include "cafCeetronNavigation.h"
 #include "cafCadNavigation.h"
@@ -78,6 +79,7 @@
 
 #include "cvfProgramOptions.h"
 #include "cvfqtUtils.h"
+#include "RimCommandObject.h"
 
 
 namespace caf
diff --git a/ApplicationCode/Application/RiaPreferences.h b/ApplicationCode/Application/RiaPreferences.h
index 4ee1873d49..bb7d3f3354 100644
--- a/ApplicationCode/Application/RiaPreferences.h
+++ b/ApplicationCode/Application/RiaPreferences.h
@@ -24,6 +24,9 @@
 #include "cafPdmField.h"
 #include "cafAppEnum.h"
 
+// Include to make Pdm work for cvf::Color
+#include "cafPdmFieldCvfColor.h"    
+
 
 class RiaPreferences : public caf::PdmObject
 {
diff --git a/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp b/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp
index b8de115c23..7da6f4c85d 100644
--- a/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp
@@ -47,6 +47,7 @@
 #include "RivGridPartMgr.h"
 #include "cvfRenderStateDepth.h"
 #include "RivSourceInfo.h"
+#include "RimFaultCollection.h"
 
 
 
diff --git a/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp b/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp
index 16a213cbe0..ee795b0004 100644
--- a/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp
@@ -50,6 +50,7 @@
 #include "RimWellCollection.h"
 #include "RivCellEdgeEffectGenerator.h"
 #include "RivSourceInfo.h"
+#include "RimFaultCollection.h"
 
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ModelVisualization/RivReservoirPipesPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirPipesPartMgr.cpp
index 842990aed1..64e58e3b3e 100644
--- a/ApplicationCode/ModelVisualization/RivReservoirPipesPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivReservoirPipesPartMgr.cpp
@@ -20,6 +20,7 @@
 
 #include "RivReservoirPipesPartMgr.h"
 #include "RimReservoirView.h"
+#include "RimWell.h"
 #include "RimWellCollection.h"
 #include "RivWellPipesPartMgr.h"
 #include "RivWellHeadPartMgr.h"
diff --git a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
index 3f78c6d111..4dbd4bb183 100644
--- a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
@@ -37,6 +37,7 @@
 #include "RimCellEdgeResultSlot.h"
 #include "Rim3dOverlayInfoConfig.h"
 #include "RimReservoirCellResultsCacher.h"
+#include "RimFaultCollection.h"
 
 //--------------------------------------------------------------------------------------------------
 /// 
diff --git a/ApplicationCode/ModelVisualization/RivWellPathCollectionPartMgr.cpp b/ApplicationCode/ModelVisualization/RivWellPathCollectionPartMgr.cpp
index ee443be4ee..4e34fcbf45 100644
--- a/ApplicationCode/ModelVisualization/RivWellPathCollectionPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivWellPathCollectionPartMgr.cpp
@@ -16,27 +16,11 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 #include "RivWellPathCollectionPartMgr.h"
-#include "RimProject.h"
-#include "RimCase.h"
-#include "RimIdenticalGridCaseGroup.h"
-#include "RimScriptCollection.h"
-#include "RimReservoirView.h"
-#include "RimReservoirCellResultsCacher.h"
-#include "RimCaseCollection.h"
-#include "RimResultSlot.h"
-#include "RimCellEdgeResultSlot.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "RimWellCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
+
+#include "RimWellPath.h"
 #include "RimWellPathCollection.h"
 #include "RivWellPathPartMgr.h"
-#include "RimWellPathCollection.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimOilField.h"
-#include "RimAnalysisModels.h"
 
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ModelVisualization/RivWellPathCollectionPartMgr.h b/ApplicationCode/ModelVisualization/RivWellPathCollectionPartMgr.h
index 8e5963d543..e5ac6a5d0e 100644
--- a/ApplicationCode/ModelVisualization/RivWellPathCollectionPartMgr.h
+++ b/ApplicationCode/ModelVisualization/RivWellPathCollectionPartMgr.h
@@ -21,11 +21,20 @@
 
 #include "cvfCollection.h"
 #include "cafPdmPointer.h"
+#include "cvfVector3.h"
+#include "cvfBoundingBox.h"
+#include "cvfTransform.h"
 
 class RimWellPathCollection;
 class RimProject;
 class RivWellPathPartMgr;
 
+namespace cvf
+{
+    class ModelBasicList;
+}
+
+
 class RivWellPathCollectionPartMgr : public cvf::Object
 {
 public:
diff --git a/ApplicationCode/ModelVisualization/RivWellPathPartMgr.h b/ApplicationCode/ModelVisualization/RivWellPathPartMgr.h
index b1dc9ed3c8..873c15296e 100644
--- a/ApplicationCode/ModelVisualization/RivWellPathPartMgr.h
+++ b/ApplicationCode/ModelVisualization/RivWellPathPartMgr.h
@@ -28,6 +28,8 @@ namespace cvf
     class ModelBasicList;
     class Transform;
     class Effect;
+    class DrawableGeo;
+    class ScalarMapper;
 }
 
 class RivPipeGeometryGenerator;
diff --git a/ApplicationCode/ModelVisualization/RivWellPipesPartMgr.cpp b/ApplicationCode/ModelVisualization/RivWellPipesPartMgr.cpp
index 592da5a8a9..546c9ef627 100644
--- a/ApplicationCode/ModelVisualization/RivWellPipesPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivWellPipesPartMgr.cpp
@@ -36,6 +36,7 @@
 
 #include "RimCase.h"
 #include "RimReservoirView.h"
+#include "RimWell.h"
 #include "RimWellCollection.h"
 #include "RimReservoirCellResultsCacher.h"
 
diff --git a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
index 347895c6a1..2ffb186033 100644
--- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
+++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
@@ -18,20 +18,17 @@
 
 #include "Rim3dOverlayInfoConfig.h"
 
-#include "RimReservoirView.h"
-#include "RiuViewer.h"
-#include "RimCase.h"
-#include "RigCaseData.h"
-#include "RimResultSlot.h"
-#include "RimCellEdgeResultSlot.h"
-#include "RimReservoirCellResultsCacher.h"
-
-#include "RimCellPropertyFilterCollection.h"
-#include "RimCellRangeFilterCollection.h"
-
-#include "RimWellCollection.h"
-#include "cafPdmFieldCvfMat4d.h"
 #include "RigCaseCellResultsData.h"
+#include "RigCaseData.h"
+#include "RimCase.h"
+#include "RimCellEdgeResultSlot.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "RimReservoirCellResultsCacher.h"
+#include "RimReservoirView.h"
+#include "RimResultSlot.h"
+#include "RimWellCollection.h"
+#include "RiuViewer.h"
+#include "RimFaultCollection.h"
 
 CAF_PDM_SOURCE_INIT(Rim3dOverlayInfoConfig, "View3dOverlayInfoConfig");
 
diff --git a/ApplicationCode/ProjectDataModel/RimAnalysisModels.cpp b/ApplicationCode/ProjectDataModel/RimAnalysisModels.cpp
index e0968679fa..5d2bd3c368 100644
--- a/ApplicationCode/ProjectDataModel/RimAnalysisModels.cpp
+++ b/ApplicationCode/ProjectDataModel/RimAnalysisModels.cpp
@@ -16,37 +16,17 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 #include "RimAnalysisModels.h"
-#include "RiaApplication.h"
-#include "RimProject.h"
-#include "cafAppEnum.h"
-#include "RimReservoirView.h"
-
-#include "RimIdenticalGridCaseGroup.h"
 
 #include "RiaApplication.h"
-
-#include "RigGridManager.h"
 #include "RigCaseData.h"
-#include "RimResultCase.h"
-#include "RimWellPathCollection.h"
-
-
-#include "cafPdmFieldCvfColor.h"
-#include "cafPdmFieldCvfMat4d.h"
-#include "RimReservoirCellResultsCacher.h"
-#include "RimCellEdgeResultSlot.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimWellCollection.h"
+#include "RigGridManager.h"
+#include "RimCase.h"
 #include "RimCaseCollection.h"
-#include "RimResultSlot.h"
+#include "RimIdenticalGridCaseGroup.h"
+#include "RimProject.h"
 #include "RimStatisticsCase.h"
-#include "RimOilField.h"
-#include "RimScriptCollection.h"
+
 
 CAF_PDM_SOURCE_INIT(RimAnalysisModels, "ResInsightAnalysisModels");
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/RimAnalysisModels.h b/ApplicationCode/ProjectDataModel/RimAnalysisModels.h
index b36cd1d28e..6a205d4778 100644
--- a/ApplicationCode/ProjectDataModel/RimAnalysisModels.h
+++ b/ApplicationCode/ProjectDataModel/RimAnalysisModels.h
@@ -18,7 +18,11 @@
 
 #pragma once
 
-#include "cafPdmDocument.h"
+#include "cafPdmField.h"
+#include "cafPdmObject.h"
+#include "cafPdmPointer.h"
+
+#include "cvfObject.h"
 
 class RimCase;
 class RigGridManager;
diff --git a/ApplicationCode/ProjectDataModel/RimCase.cpp b/ApplicationCode/ProjectDataModel/RimCase.cpp
index e412c1557e..90f1115fc5 100644
--- a/ApplicationCode/ProjectDataModel/RimCase.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCase.cpp
@@ -16,51 +16,25 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-//#include "RiaStdInclude.h"
 #include "RimCase.h"
 
+#include "RigCaseCellResultsData.h"
+#include "RigCaseData.h"
+#include "RimCaseCollection.h"
+#include "RimCellEdgeResultSlot.h"
+#include "RimCellPropertyFilter.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "RimReservoirCellResultsCacher.h"
+#include "RimReservoirView.h"
+#include "RimResultSlot.h"
+
+#include "cafProgressInfo.h"
+
 #include <QFile>
 #include <QFileInfo>
 #include <QDir>
 #include <QDebug>
 
-#include "RifReaderEclipseOutput.h"
-#include "RifReaderMockModel.h"
-
-#include "RimReservoirView.h"
-#include "cafPdmFieldCvfMat4d.h"
-#include "cafPdmFieldCvfColor.h"
-#include "RimCellRangeFilter.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimCellPropertyFilter.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimIdenticalGridCaseGroup.h"
-#include "RimWellCollection.h"
-#include "RimWellPathCollection.h"
-
-#include "RimScriptCollection.h"
-
-#include "RigCaseData.h"
-#include "RigMainGrid.h"
-#include "RigCaseCellResultsData.h"
-
-#include "cvfAssert.h"
-
-#include "cafPdmFieldCvfColor.h"
-
-#include "cafPdmUiPushButtonEditor.h"
-
-#include <QString>
-#include "RimProject.h"
-#include "RimReservoirCellResultsCacher.h"
-#include "RimResultSlot.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "RimCellEdgeResultSlot.h"
-#include "RimCaseCollection.h"
-#include "RimOilField.h"
-#include "RimAnalysisModels.h"
-#include "cafProgressInfo.h"
 
 CAF_PDM_SOURCE_INIT(RimCase, "RimReservoir");
 
diff --git a/ApplicationCode/ProjectDataModel/RimCaseCollection.cpp b/ApplicationCode/ProjectDataModel/RimCaseCollection.cpp
index bf8064a8bb..630684c92c 100644
--- a/ApplicationCode/ProjectDataModel/RimCaseCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCaseCollection.cpp
@@ -17,22 +17,10 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RimCaseCollection.h"
-#include "RimCase.h"
 
-#include "RimReservoirView.h"
+#include "RimCase.h"
 #include "RimIdenticalGridCaseGroup.h"
 
-#include "cafPdmFieldCvfColor.h"
-#include "cafPdmFieldCvfMat4d.h"
-
-#include "RimReservoirCellResultsCacher.h"
-#include "RimResultSlot.h"
-
-#include "RimCellEdgeResultSlot.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimWellCollection.h"
 
 CAF_PDM_SOURCE_INIT(RimCaseCollection, "RimCaseCollection");
 
diff --git a/ApplicationCode/ProjectDataModel/RimCellEdgeResultSlot.cpp b/ApplicationCode/ProjectDataModel/RimCellEdgeResultSlot.cpp
index 93383d0522..51c17c1a5d 100644
--- a/ApplicationCode/ProjectDataModel/RimCellEdgeResultSlot.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCellEdgeResultSlot.cpp
@@ -17,20 +17,15 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RimCellEdgeResultSlot.h"
-#include "RimReservoirCellResultsCacher.h"
 
-#include "RimLegendConfig.h"
-#include "RimReservoirView.h"
 #include "RigCaseCellResultsData.h"
-#include "cafPdmUiListEditor.h"
+#include "RimLegendConfig.h"
+#include "RimReservoirCellResultsCacher.h"
+#include "RimReservoirView.h"
+
+#include "cafPdmUiListEditor.h"
+#include "cvfMath.h"
 
-#include "cafPdmFieldCvfColor.h"
-#include "cafPdmFieldCvfMat4d.h"
-#include "RimResultSlot.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimWellCollection.h"
 
 CAF_PDM_SOURCE_INIT(RimCellEdgeResultSlot, "CellEdgeResultSlot");
 
diff --git a/ApplicationCode/ProjectDataModel/RimCellPropertyFilter.cpp b/ApplicationCode/ProjectDataModel/RimCellPropertyFilter.cpp
index abb2b6d3fc..ecfa62dbe5 100644
--- a/ApplicationCode/ProjectDataModel/RimCellPropertyFilter.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCellPropertyFilter.cpp
@@ -17,13 +17,15 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RimCellPropertyFilter.h"
-#include "RimResultDefinition.h"
-#include "cvfMath.h"
 
-#include "RimCellPropertyFilterCollection.h"
 #include "RigCaseCellResultsData.h"
-#include "cafPdmUiDoubleSliderEditor.h"
+#include "RimCellPropertyFilterCollection.h"
 #include "RimReservoirCellResultsCacher.h"
+#include "RimResultDefinition.h"
+
+#include "cafPdmUiDoubleSliderEditor.h"
+#include "cvfAssert.h"
+#include "cvfMath.h"
 
 
 namespace caf
diff --git a/ApplicationCode/ProjectDataModel/RimCellPropertyFilter.h b/ApplicationCode/ProjectDataModel/RimCellPropertyFilter.h
index 02c7677a60..71a942b3ee 100644
--- a/ApplicationCode/ProjectDataModel/RimCellPropertyFilter.h
+++ b/ApplicationCode/ProjectDataModel/RimCellPropertyFilter.h
@@ -18,14 +18,7 @@
 
 #pragma once
 
-#include "cafPdmObject.h"
-#include "cafPdmField.h"
-#include "cafPdmDocument.h"
-#include "cafAppEnum.h"
-
-#include "RimDefines.h"
 #include "RimCellFilter.h"
-//#include "cvfStructGridGeometryGenerator.h"
 
 class RimReservoirView;
 class RimCellPropertyFilterCollection;
@@ -34,10 +27,6 @@ class RimResultDefinition;
 class RigGridBase;
 class RigCaseCellResultsData;
 
-namespace cvf
-{
-    //enum CellRangeFilter::CellStateType;
-}
 
 //==================================================================================================
 ///  
@@ -81,5 +70,3 @@ private:
     double m_minimumResultValue, m_maximumResultValue;
 };
 
-
-
diff --git a/ApplicationCode/ProjectDataModel/RimCellPropertyFilterCollection.cpp b/ApplicationCode/ProjectDataModel/RimCellPropertyFilterCollection.cpp
index b12923b5c5..9c4b2bcfb3 100644
--- a/ApplicationCode/ProjectDataModel/RimCellPropertyFilterCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCellPropertyFilterCollection.cpp
@@ -22,13 +22,6 @@
 #include "RimResultDefinition.h"
 #include "RimResultSlot.h"
 
-#include "cafPdmFieldCvfColor.h"
-#include "cafPdmFieldCvfMat4d.h"
-#include "RimCellRangeFilterCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimWellCollection.h"
-#include "RimCellEdgeResultSlot.h"
-
 
 CAF_PDM_SOURCE_INIT(RimCellPropertyFilterCollection, "CellPropertyFilters");
 
diff --git a/ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp b/ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp
index 2bb0fc64cf..4bc3f601d2 100644
--- a/ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp
@@ -16,26 +16,19 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-//#include "RiaStdInclude.h"
 
 #include "RimCellRangeFilter.h"
+
+#include "RigActiveCellInfo.h"
+#include "RigCaseData.h"
+#include "RigGridBase.h"
+#include "RigMainGrid.h"
+#include "RimCase.h"
 #include "RimCellRangeFilterCollection.h"
 #include "RimReservoirView.h"
-#include "RigCaseData.h"
-#include "RimCase.h"
-
-#include "cafPdmFieldCvfMat4d.h"
-#include "cafPdmFieldCvfColor.h"
-#include "RimResultSlot.h"
-#include "RimCellEdgeResultSlot.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "RimWellCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimReservoirCellResultsCacher.h"
 
 #include "cafPdmUiSliderEditor.h"
-
+#include "cvfAssert.h"
 
 CAF_PDM_SOURCE_INIT(RimCellRangeFilter, "CellRangeFilter");
 
diff --git a/ApplicationCode/ProjectDataModel/RimCellRangeFilter.h b/ApplicationCode/ProjectDataModel/RimCellRangeFilter.h
index acb2372a87..fe4bbbc10e 100644
--- a/ApplicationCode/ProjectDataModel/RimCellRangeFilter.h
+++ b/ApplicationCode/ProjectDataModel/RimCellRangeFilter.h
@@ -18,11 +18,11 @@
 
 #pragma once
 
-#include "cafPdmField.h"
-#include "cafPdmObject.h"
-#include "cafPdmPointer.h"
 #include "RimCellFilter.h"
 
+class RigGridBase;
+class RigMainGrid;
+class RimCellRangeFilterCollection;
 class RimReservoirView;
 
 namespace cvf
@@ -30,10 +30,6 @@ namespace cvf
     class CellRangeFilter;
 }
 
-class RimCellRangeFilterCollection;
-class RigMainGrid;
-class RigGridBase;
-
 //==================================================================================================
 ///  
 ///  
diff --git a/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp b/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp
index eb9bc8bbba..7d1a6ec91f 100644
--- a/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp
@@ -16,20 +16,12 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-//#include "RiaStdInclude.h"
-
 #include "RimCellRangeFilterCollection.h"
+
 #include "RimCase.h"
+#include "RigGridBase.h"
 #include "RimReservoirView.h"
 #include "RigCaseData.h"
-#include "cafPdmFieldCvfMat4d.h"
-#include "cafPdmFieldCvfColor.h"
-#include "RimResultSlot.h"
-#include "RimCellEdgeResultSlot.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "RimReservoirCellResultsCacher.h"
-#include "RimWellCollection.h"
 
 
 CAF_PDM_SOURCE_INIT(RimCellRangeFilterCollection, "CellRangeFilterCollection");
diff --git a/ApplicationCode/ProjectDataModel/RimCommandObject.cpp b/ApplicationCode/ProjectDataModel/RimCommandObject.cpp
index 858f936def..554d8d926b 100644
--- a/ApplicationCode/ProjectDataModel/RimCommandObject.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCommandObject.cpp
@@ -17,34 +17,17 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RimCommandObject.h"
+
 #include "RiaApplication.h"
 #include "RimCalcScript.h"
 #include "RimProject.h"
-
-#include "cafPdmUiTextEditor.h"
-#include "cafPdmUiPushButtonEditor.h"
-#include "cafPdmDocument.h"
-
-#include <QFile>
 #include "RimStatisticsCase.h"
 
-// Included due to template use in pdm fields
-#include "RimReservoirView.h"
-#include "RimReservoirCellResultsCacher.h"
-#include "RimResultSlot.h"
-#include "RimCellEdgeResultSlot.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "RimWellCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimOilField.h"
-#include "RimScriptCollection.h"
-#include "RimIdenticalGridCaseGroup.h"
-#include "RimAnalysisModels.h"
-#include "RimWellPathCollection.h"
-#include "RimCaseCollection.h"
-
+#include "cafPdmDocument.h"
+#include "cafPdmUiPushButtonEditor.h"
+#include "cafPdmUiTextEditor.h"
 
+#include <QFile>
 
 
 CAF_PDM_SOURCE_INIT(RimCommandObject, "RimCommandObject");
diff --git a/ApplicationCode/ProjectDataModel/RimCommandObject.h b/ApplicationCode/ProjectDataModel/RimCommandObject.h
index 4123802cda..25e40878fb 100644
--- a/ApplicationCode/ProjectDataModel/RimCommandObject.h
+++ b/ApplicationCode/ProjectDataModel/RimCommandObject.h
@@ -22,9 +22,7 @@
 #include "cvfObject.h"
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
-#include "cafPdmDocument.h"
 
-#include <QString>
 
 //--------------------------------------------------------------------------------------------------
 /// 
diff --git a/ApplicationCode/ProjectDataModel/RimFault.h b/ApplicationCode/ProjectDataModel/RimFault.h
index b85c18d7da..22bac08bf6 100644
--- a/ApplicationCode/ProjectDataModel/RimFault.h
+++ b/ApplicationCode/ProjectDataModel/RimFault.h
@@ -23,8 +23,9 @@
 #include "cafPdmPointer.h"
 
 #include "cvfBase.h"
-#include "cvfColor3.h"
-#include "cafPdmFieldCvfColor.h"
+
+// Include to make Pdm work for cvf::Color
+#include "cafPdmFieldCvfColor.h"    
 
 class RigFault;
 
diff --git a/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp b/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp
index 2de8ac55df..e634f26644 100644
--- a/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp
@@ -18,10 +18,6 @@
 
 #include "RimFaultCollection.h"
 
-#include "cafAppEnum.h"
-#include "cafPdmFieldCvfColor.h"
-#include "cafPdmFieldCvfMat4d.h"
-
 #include "RiaApplication.h"
 #include "RiaPreferences.h"
 #include "RigCaseData.h"
@@ -30,6 +26,9 @@
 #include "RiuMainWindow.h"
 #include "RivColorTableArray.h"
 
+#include "cafAppEnum.h"
+#include "cafPdmFieldCvfColor.h"
+#include "cafPdmFieldCvfMat4d.h"
 
 namespace caf
 {
diff --git a/ApplicationCode/ProjectDataModel/RimFaultCollection.h b/ApplicationCode/ProjectDataModel/RimFaultCollection.h
index 0d2cb37b66..aacb41cd51 100644
--- a/ApplicationCode/ProjectDataModel/RimFaultCollection.h
+++ b/ApplicationCode/ProjectDataModel/RimFaultCollection.h
@@ -18,20 +18,22 @@
 
 #pragma once
 
+#include "cafAppEnum.h"
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 #include "cafPdmPointer.h"
-#include "cafAppEnum.h"
+#include "cvfBase.h"
+
+// Include to make Pdm work for cvf::Color
+#include "cafPdmFieldCvfColor.h"    
+
+#include "RimReservoirCellResultsCacher.h"
+
 #include <QString>
 
-#include "cvfBase.h"
-#include "cvfColor3.h"
-
 class RimFault;
-
 class RimReservoirView;
 
-
 //==================================================================================================
 ///  
 ///  
diff --git a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
index 0b1708f315..86a64b0b19 100644
--- a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
+++ b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
@@ -18,33 +18,21 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RimIdenticalGridCaseGroup.h"
-#include "RimCaseCollection.h"
 
-#include "RimCase.h"
-#include "RimReservoirView.h"
-#include "RigCaseData.h"
+#include "RigActiveCellInfo.h"
 #include "RigCaseCellResultsData.h"
-
-#include "RimResultSlot.h"
+#include "RigCaseData.h"
+#include "RigGridManager.h"
+#include "RimCase.h"
+#include "RimCaseCollection.h"
 #include "RimCellEdgeResultSlot.h"
+#include "RimReservoirCellResultsCacher.h"
+#include "RimReservoirView.h"
+#include "RimResultCase.h"
+#include "RimResultSlot.h"
 #include "RimStatisticsCase.h"
 
-#include "RimResultCase.h"
 #include "cafProgressInfo.h"
-#include "RigActiveCellInfo.h"
-#include "RigActiveCellInfo.h"
-
-#include "RigGridManager.h"
-#include "RimReservoirCellResultsCacher.h"
-
-
-#include "cafPdmFieldCvfColor.h"
-#include "cafPdmFieldCvfMat4d.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimWellCollection.h"
-
 
 CAF_PDM_SOURCE_INIT(RimIdenticalGridCaseGroup, "RimIdenticalGridCaseGroup");
 
diff --git a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.h b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.h
index e3da03cc8e..31c66c8211 100644
--- a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.h
+++ b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.h
@@ -25,7 +25,6 @@
 
 #include "RifReaderInterface.h"
 
-//#include "RimStatisticsCaseCollection.h"
 class RimCaseCollection;
 class RimStatisticsCase;
 
diff --git a/ApplicationCode/ProjectDataModel/RimInputCase.cpp b/ApplicationCode/ProjectDataModel/RimInputCase.cpp
index e9ab1a607f..b1a77bf364 100644
--- a/ApplicationCode/ProjectDataModel/RimInputCase.cpp
+++ b/ApplicationCode/ProjectDataModel/RimInputCase.cpp
@@ -16,34 +16,23 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-//#include "RiaStdInclude.h"
-
 #include "RimInputCase.h"
+
+#include "RiaPreferences.h"
+#include "RifEclipseInputFileTools.h"
+#include "RifReaderEclipseInput.h"
+#include "RifReaderInterface.h"
+#include "RifReaderMockModel.h"
+#include "RigCaseCellResultsData.h"
+#include "RigCaseData.h"
+#include "RimDefines.h"
+#include "RimInputProperty.h"
 #include "RimInputPropertyCollection.h"
 #include "RimReservoirCellResultsCacher.h"
-#include <QFileInfo>
 
-#include "RimReservoirView.h"
-#include "RifReaderEclipseInput.h"
-#include "RigCaseData.h"
-#include "RigCaseCellResultsData.h"
-
-#include "RifReaderMockModel.h"
-#include "RifEclipseInputFileTools.h"
 #include "cafProgressInfo.h"
 
-#include "RiaApplication.h"
-#include "RiaPreferences.h"
-
-#include "cafPdmFieldCvfColor.h"
-#include "cafPdmFieldCvfMat4d.h"
-
-#include "RimCellEdgeResultSlot.h"
-#include "RimResultSlot.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimWellCollection.h"
+#include <QFileInfo>
 
 CAF_PDM_SOURCE_INIT(RimInputCase, "RimInputReservoir");
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/RimInputProperty.cpp b/ApplicationCode/ProjectDataModel/RimInputProperty.cpp
index 95936e5f54..3aed9d899f 100644
--- a/ApplicationCode/ProjectDataModel/RimInputProperty.cpp
+++ b/ApplicationCode/ProjectDataModel/RimInputProperty.cpp
@@ -16,13 +16,10 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 #include "RimInputProperty.h"
 
-#include "cvfAssert.h"
-
 #include "cafPdmUiLineEditor.h"
+#include "cvfAssert.h"
 
 #include <QString>
 
diff --git a/ApplicationCode/ProjectDataModel/RimInputPropertyCollection.cpp b/ApplicationCode/ProjectDataModel/RimInputPropertyCollection.cpp
index 5798253f13..8250191135 100644
--- a/ApplicationCode/ProjectDataModel/RimInputPropertyCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimInputPropertyCollection.cpp
@@ -16,10 +16,11 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 #include "RimInputPropertyCollection.h"
 
+#include "RimInputProperty.h"
+
+#include <QFileInfo>
 
 CAF_PDM_SOURCE_INIT(RimInputPropertyCollection, "RimInputPropertyCollection");
 
diff --git a/ApplicationCode/ProjectDataModel/RimInputPropertyCollection.h b/ApplicationCode/ProjectDataModel/RimInputPropertyCollection.h
index 2e865fda76..302e97a50b 100644
--- a/ApplicationCode/ProjectDataModel/RimInputPropertyCollection.h
+++ b/ApplicationCode/ProjectDataModel/RimInputPropertyCollection.h
@@ -23,7 +23,7 @@
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 
-#include "RimInputProperty.h"
+class RimInputProperty;
 
 
 //==================================================================================================
diff --git a/ApplicationCode/ProjectDataModel/RimOilField.cpp b/ApplicationCode/ProjectDataModel/RimOilField.cpp
index 8f078071de..13855a3962 100644
--- a/ApplicationCode/ProjectDataModel/RimOilField.cpp
+++ b/ApplicationCode/ProjectDataModel/RimOilField.cpp
@@ -16,33 +16,10 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 #include "RimOilField.h"
-#include "cafAppEnum.h"
-#include "RimReservoirView.h"
 
-#include "RimIdenticalGridCaseGroup.h"
-
-#include "RiaApplication.h"
-
-#include "RigGridManager.h"
-#include "RigCaseData.h"
-#include "RimResultCase.h"
-#include "RimWellPathCollection.h"
 #include "RimAnalysisModels.h"
-
-#include "cafPdmFieldCvfColor.h"
-#include "cafPdmFieldCvfMat4d.h"
-#include "RimReservoirCellResultsCacher.h"
-#include "RimCellEdgeResultSlot.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimWellCollection.h"
-#include "RimCaseCollection.h"
-#include "RimResultSlot.h"
-#include "RimStatisticsCase.h"
+#include "RimWellPathCollection.h"
 
 CAF_PDM_SOURCE_INIT(RimOilField, "ResInsightOilField");
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/RimOilField.h b/ApplicationCode/ProjectDataModel/RimOilField.h
index 9b296aad83..925c20b378 100644
--- a/ApplicationCode/ProjectDataModel/RimOilField.h
+++ b/ApplicationCode/ProjectDataModel/RimOilField.h
@@ -18,13 +18,10 @@
 
 #pragma once
 
-#include "cafPdmDocument.h"
+#include "cafPdmField.h"
+#include "cafPdmObject.h"
+#include "cafPdmPointer.h"
 
-class RimCase;
-class RigGridManager;
-class RimIdenticalGridCaseGroup;
-class RigMainGrid;
-class RigCaseData;
 class RimWellPathCollection;
 class RimAnalysisModels;
 
@@ -40,7 +37,6 @@ public:
     RimOilField(void);
     virtual ~RimOilField(void);
 
-    caf::PdmField<RimAnalysisModels*>                   analysisModels;
-	caf::PdmField<RimWellPathCollection*>               wellPathCollection;
-
+    caf::PdmField<RimAnalysisModels*>       analysisModels;
+	caf::PdmField<RimWellPathCollection*>   wellPathCollection;
 };
diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp
index 357a18bfdc..03bd43fcfe 100644
--- a/ApplicationCode/ProjectDataModel/RimProject.cpp
+++ b/ApplicationCode/ProjectDataModel/RimProject.cpp
@@ -16,38 +16,22 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 #include "RimProject.h"
-#include "cafAppEnum.h"
-
-#include "RimOilField.h"
-#include "RimAnalysisModels.h"
-
-#include "RimReservoirView.h"
-#include "RimScriptCollection.h"
-#include "RimIdenticalGridCaseGroup.h"
 
 #include "RiaApplication.h"
 #include "RiaVersionInfo.h"
-
-#include "RigGridManager.h"
 #include "RigCaseData.h"
-#include "RimResultCase.h"
-#include "RimWellPathCollection.h"
-
-
-#include "cafPdmFieldCvfColor.h"
-#include "cafPdmFieldCvfMat4d.h"
-#include "RimReservoirCellResultsCacher.h"
-#include "RimCellEdgeResultSlot.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimWellCollection.h"
+#include "RimAnalysisModels.h"
+#include "RimCase.h"
 #include "RimCaseCollection.h"
-#include "RimResultSlot.h"
-#include "RimStatisticsCase.h"
+#include "RimIdenticalGridCaseGroup.h"
+#include "RimOilField.h"
+#include "RimReservoirView.h"
+#include "RimScriptCollection.h"
+#include "RimWellPathCollection.h"
+#include "RimWellPathImport.h"
+
+#include <QDir>
 
 CAF_PDM_SOURCE_INIT(RimProject, "ResInsightProject");
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/RimProject.h b/ApplicationCode/ProjectDataModel/RimProject.h
index 28c6b5f9fa..3226a0ee1e 100644
--- a/ApplicationCode/ProjectDataModel/RimProject.h
+++ b/ApplicationCode/ProjectDataModel/RimProject.h
@@ -19,8 +19,6 @@
 #pragma once
 
 #include "cafPdmDocument.h"
-#include "RimWellPathImport.h"
-#include "RimCommandObject.h"
 
 class RimOilField;
 class RimCase;
@@ -29,6 +27,8 @@ class RimScriptCollection;
 class RimIdenticalGridCaseGroup;
 class RigMainGrid;
 class RigCaseData;
+class RimWellPathImport;
+class RimCommandObject;
 
 //==================================================================================================
 ///  
diff --git a/ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.cpp b/ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.cpp
index 9b3357a8e1..25bbd9f503 100644
--- a/ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.cpp
+++ b/ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.cpp
@@ -16,39 +16,20 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-//#include "RiaStdInclude.h"
+#include "RimReservoirCellResultsCacher.h"
+
+#include "RigCaseCellResultsData.h"
+#include "RigMainGrid.h"
+#include "RimTools.h"
+
+#include "cafProgressInfo.h"
+
+#include <QDebug>
+#include <QDir>
 #include <QFile>
 #include <QFileInfo>
-#include <QDir>
-#include <QDebug>
 #include <QUuid>
 
-#include "RimReservoirCellResultsCacher.h"
-#include "RigCaseCellResultsData.h"
-#include "RiaApplication.h"
-#include "RigMainGrid.h"
-#include "RigCell.h"
-#include "cafProgressInfo.h"
-#include "RimProject.h"
-#include "RimCase.h"
-#include "RimCaseCollection.h"
-#include "RimIdenticalGridCaseGroup.h"
-#include "RimScriptCollection.h"
-#include "RimReservoirView.h"
-
-#include "cafPdmFieldCvfMat4d.h"
-#include "cafPdmFieldCvfColor.h"
-#include "RimResultSlot.h"
-#include "RimCellEdgeResultSlot.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "RimWellCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimWellPathCollection.h"
-#include "RimOilField.h"
-#include "RimAnalysisModels.h"
-#include "RimTools.h"
-
 CAF_PDM_SOURCE_INIT(RimReservoirCellResultsStorage, "ReservoirCellResultStorage");
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.h b/ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.h
index f6f7a567f3..7208bcd83e 100644
--- a/ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.h
+++ b/ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.h
@@ -18,15 +18,17 @@
 
 #pragma once
 
-#include <QDateTime>
 
-#include "cvfBase.h"
-#include "cvfObject.h"
+#include "cafAppEnum.h"
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
-#include "cafAppEnum.h"
+#include "cvfBase.h"
+#include "cvfObject.h"
+
 #include "RimDefines.h"
 
+#include <QDateTime>
+
 class RimReservoirCellResultsStorageEntryInfo;
 class RigCaseCellResultsData;
 class RifReaderInterface;
diff --git a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp
index 3438706133..ddbbf10f36 100644
--- a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp
@@ -16,66 +16,44 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-//#include "RiaStdInclude.h"
 #include "RimReservoirView.h"
-#include "RiuViewer.h"
-#include "cvfViewport.h" 
-#include "cvfModelBasicList.h"
-#include "cvfPart.h"
-#include "cvfDrawable.h"
-#include "cvfScene.h"
 
-#include "cafPdmFieldCvfMat4d.h"
-#include "cafPdmFieldCvfColor.h"
-#include <QMessageBox>
-
-
-#include "RimProject.h"
-#include "RimCase.h"
-#include "RimResultSlot.h"
-#include "RimCellEdgeResultSlot.h"
-#include "RimCellRangeFilter.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimCellPropertyFilter.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimWellPathCollection.h"
-#include "RimIdenticalGridCaseGroup.h"
-#include "RimScriptCollection.h"
-#include "RimCaseCollection.h"
-#include "RimOilField.h"
-#include "RimAnalysisModels.h"
-#include "RimTernaryLegendConfig.h"
-
-#include "RiuMainWindow.h"
-#include "RigGridBase.h"
-#include "RigCaseData.h"
 #include "RiaApplication.h"
 #include "RiaPreferences.h"
-
-#include "cafEffectGenerator.h"
-#include "cafFrameAnimationControl.h"
-
-#include "cvfStructGridGeometryGenerator.h"
 #include "RigCaseCellResultsData.h"
-#include "RivCellEdgeEffectGenerator.h"
-#include "cvfqtUtils.h"
-#include "RivReservoirViewPartMgr.h"
+#include "RigCaseData.h"
+#include "Rim3dOverlayInfoConfig.h"
+#include "RimCase.h"
+#include "RimCellEdgeResultSlot.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "RimCellRangeFilterCollection.h"
+#include "RimFaultCollection.h"
+#include "RimOilField.h"
+#include "RimProject.h"
+#include "RimResultSlot.h"
+#include "RimTernaryLegendConfig.h"
+#include "RimWell.h"
+#include "RimWellCollection.h"
+#include "RimWellPathCollection.h"
+#include "RiuMainWindow.h"
+#include "RiuViewer.h"
 #include "RivReservoirPipesPartMgr.h"
+#include "RivWellPathCollectionPartMgr.h"
 
 #include "cafCadNavigation.h"
-#include "cafCeetronNavigation.h"
-#include "RimCase.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RigGridScalarDataAccess.h"
-#include "RimReservoirCellResultsCacher.h"
-#include "RivWellPathCollectionPartMgr.h"
-#include "cvfOverlayScalarMapperLegend.h"
-
-#include <limits.h>
 #include "cafCeetronPlusNavigation.h"
-#include "RimFaultCollection.h"
-#include "RivTernarySaturationOverlayItem.h"
+#include "cafFrameAnimationControl.h"
+
+#include "cvfDrawable.h"
+#include "cvfModelBasicList.h"
+#include "cvfOverlayScalarMapperLegend.h"
+#include "cvfPart.h"
+#include "cvfScene.h"
+#include "cvfViewport.h" 
+#include "cvfqtUtils.h"
+
+#include <QMessageBox>
+
 
 namespace caf {
 
diff --git a/ApplicationCode/ProjectDataModel/RimReservoirView.h b/ApplicationCode/ProjectDataModel/RimReservoirView.h
index a45a6c2e1d..95ae186b5a 100644
--- a/ApplicationCode/ProjectDataModel/RimReservoirView.h
+++ b/ApplicationCode/ProjectDataModel/RimReservoirView.h
@@ -17,40 +17,38 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
-#include "cafPdmObject.h"
-#include "cafPdmField.h"
-#include "cafAppEnum.h"
 
+#include "cafAppEnum.h"
+#include "cafPdmField.h"
+#include "cafPdmObject.h"
+
+#include "cvfArray.h"
 #include "cvfBase.h"
 #include "cvfObject.h"
 
+// Includes to make Pdm work for cvf::Color and cvf:Mat
+#include "cafPdmFieldCvfColor.h"    
 #include "cafPdmFieldCvfMat4d.h"
-#include "cafPdmFieldCvfColor.h"
-
-#include <QPointer>
-#include <QString>
-
-#include "RimFaultCollection.h"
-
-class RimCase;
-class RimResultSlot;
-class RimCellEdgeResultSlot;
-class RimCellRangeFilter;
-class RimCellRangeFilterCollection;
-class RimCellPropertyFilter;
-class RimCellPropertyFilterCollection;
-class Rim3dOverlayInfoConfig;
-class RimReservoirCellResultsStorage;
-class RimWellCollection;
-class RigActiveCellInfo;
 
 #include "RivReservoirViewPartMgr.h"
-class RivReservoirPipesPartMgr;
 
-class RiuViewer;
+class RigActiveCellInfo;
 class RigGridBase;
 class RigGridCellFaceVisibilityFilter;
+class Rim3dOverlayInfoConfig;
+class RimCase;
+class RimCellEdgeResultSlot;
+class RimCellPropertyFilter;
+class RimCellPropertyFilterCollection;
+class RimCellRangeFilter;
+class RimCellRangeFilterCollection;
+class RimFaultCollection;
 class RimReservoirCellResultsStorage;
+class RimReservoirCellResultsStorage;
+class RimResultSlot;
+class RimWellCollection;
+class RiuViewer;
+class RivReservoirPipesPartMgr;
 
 namespace cvf
 {
diff --git a/ApplicationCode/ProjectDataModel/RimResultCase.cpp b/ApplicationCode/ProjectDataModel/RimResultCase.cpp
index d0d72587fa..626f4cf15a 100644
--- a/ApplicationCode/ProjectDataModel/RimResultCase.cpp
+++ b/ApplicationCode/ProjectDataModel/RimResultCase.cpp
@@ -16,41 +16,25 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
-#include "cafProgressInfo.h"
-#include "cafPdmSettings.h"
-#include "cafPdmFieldCvfMat4d.h"
-#include "cafPdmFieldCvfColor.h"
-#include "cafPdmUiPropertyDialog.h"
-
 #include "RimResultCase.h"
-#include "RigCaseData.h"
-#include "RifReaderEclipseOutput.h"
-#include "RigCaseCellResultsData.h"
-#include "RimReservoirView.h"
-#include "RifReaderMockModel.h"
-#include "RifReaderEclipseInput.h"
 
-#include "RimProject.h"
-#include "RifEclipseOutputFileTools.h"
-#include "RiaApplication.h"
-#include "RimIdenticalGridCaseGroup.h"
-#include "RimScriptCollection.h"
-#include "RimCaseCollection.h"
-#include "RimReservoirCellResultsCacher.h"
-#include "RimWellPathCollection.h"
-
-#include "RimResultSlot.h"
-#include "RimCellEdgeResultSlot.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "RimWellCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimOilField.h"
-#include "RimAnalysisModels.h"
 #include "RiaPreferences.h"
+#include "RifEclipseOutputFileTools.h"
+#include "RifReaderEclipseOutput.h"
+#include "RifReaderMockModel.h"
+#include "RigCaseCellResultsData.h"
+#include "RigCaseData.h"
 #include "RimMockModelSettings.h"
+#include "RimProject.h"
+#include "RimReservoirCellResultsCacher.h"
+
+#include "cafPdmSettings.h"
+#include "cafPdmUiPropertyDialog.h"
+#include "cafProgressInfo.h"
+
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
 
 CAF_PDM_SOURCE_INIT(RimResultCase, "EclipseCase");
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/RimResultCase.h b/ApplicationCode/ProjectDataModel/RimResultCase.h
index 0463cdf508..9d768fc36b 100644
--- a/ApplicationCode/ProjectDataModel/RimResultCase.h
+++ b/ApplicationCode/ProjectDataModel/RimResultCase.h
@@ -18,10 +18,6 @@
 
 #pragma once
 
-#include "cvfBase.h"
-#include "cvfObject.h"
-#include "cafPdmField.h"
-#include "cafPdmObject.h"
 #include "RimCase.h"
 
 class RifReaderInterface;
diff --git a/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp
index 110036ffb8..4e5873dda3 100644
--- a/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp
+++ b/ApplicationCode/ProjectDataModel/RimResultDefinition.cpp
@@ -16,28 +16,16 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-//#include "RiaStdInclude.h"
-
 #include "RimResultDefinition.h"
-#include "RimReservoirCellResultsCacher.h"
 
-#include "RimReservoirView.h"
-#include "RimCase.h"
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
-#include "RigMainGrid.h"
+#include "RimCase.h"
+#include "RimReservoirCellResultsCacher.h"
+#include "RimReservoirView.h"
+
 #include "cafPdmUiListEditor.h"
 
-
-#include "cafPdmFieldCvfMat4d.h"
-#include "cafPdmFieldCvfColor.h"
-#include "RimResultSlot.h"
-#include "RimCellEdgeResultSlot.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "RimWellCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
-
 CAF_PDM_SOURCE_INIT(RimResultDefinition, "ResultDefinition");
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/RimResultDefinition.h b/ApplicationCode/ProjectDataModel/RimResultDefinition.h
index 3e7e463f7d..f399262ee2 100644
--- a/ApplicationCode/ProjectDataModel/RimResultDefinition.h
+++ b/ApplicationCode/ProjectDataModel/RimResultDefinition.h
@@ -18,10 +18,11 @@
 
 #pragma once
 
-#include "cafPdmObject.h"
+#include "RimDefines.h"
+
 #include "cafAppEnum.h"
 #include "cafPdmField.h"
-#include "RimDefines.h"
+#include "cafPdmObject.h"
 #include "cafPdmPointer.h"
 
 
diff --git a/ApplicationCode/ProjectDataModel/RimResultSlot.cpp b/ApplicationCode/ProjectDataModel/RimResultSlot.cpp
index 38108eaf5f..dc7af09867 100644
--- a/ApplicationCode/ProjectDataModel/RimResultSlot.cpp
+++ b/ApplicationCode/ProjectDataModel/RimResultSlot.cpp
@@ -16,8 +16,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 #include "RimResultSlot.h"
 
 #include "RimReservoirView.h"
diff --git a/ApplicationCode/ProjectDataModel/RimResultSlot.h b/ApplicationCode/ProjectDataModel/RimResultSlot.h
index afa92bb3a3..390b3cc053 100644
--- a/ApplicationCode/ProjectDataModel/RimResultSlot.h
+++ b/ApplicationCode/ProjectDataModel/RimResultSlot.h
@@ -18,9 +18,6 @@
 
 #pragma once
 
-#include "cafAppEnum.h"
-#include "cafPdmObject.h"
-
 #include "RimDefines.h"
 #include "RimLegendConfig.h"
 #include "RimResultDefinition.h"
diff --git a/ApplicationCode/ProjectDataModel/RimScriptCollection.cpp b/ApplicationCode/ProjectDataModel/RimScriptCollection.cpp
index 2e597e678e..17e3053bd6 100644
--- a/ApplicationCode/ProjectDataModel/RimScriptCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimScriptCollection.cpp
@@ -16,15 +16,16 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
-
 #include "RimScriptCollection.h"
-#include "cafPdmField.h"
-#include "cafUtils.h"
-#include "RiuMainWindow.h"
+
+#include "RimCalcScript.h"
 #include "RimUiTreeModelPdm.h"
+#include "RiuMainWindow.h"
+
 #include "cafPdmUiFilePathEditor.h"
+#include "cafUtils.h"
+
+#include <QDir>
 
 CAF_PDM_SOURCE_INIT(RimScriptCollection, "ScriptLocation");
 
diff --git a/ApplicationCode/ProjectDataModel/RimScriptCollection.h b/ApplicationCode/ProjectDataModel/RimScriptCollection.h
index 0c030e9be6..88c4bcffa3 100644
--- a/ApplicationCode/ProjectDataModel/RimScriptCollection.h
+++ b/ApplicationCode/ProjectDataModel/RimScriptCollection.h
@@ -20,7 +20,8 @@
 
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
-#include "RimCalcScript.h"
+
+class RimCalcScript;
 
 namespace caf
 {
diff --git a/ApplicationCode/ProjectDataModel/RimStatisticsCase.cpp b/ApplicationCode/ProjectDataModel/RimStatisticsCase.cpp
index e942b18b0d..dba119e9b7 100644
--- a/ApplicationCode/ProjectDataModel/RimStatisticsCase.cpp
+++ b/ApplicationCode/ProjectDataModel/RimStatisticsCase.cpp
@@ -16,35 +16,23 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 #include "RimStatisticsCase.h"
-#include "RimReservoirView.h"
-#include "cafPdmUiOrdering.h"
-#include "RimIdenticalGridCaseGroup.h"
-#include "RigCaseData.h"
+
 #include "RigCaseCellResultsData.h"
-#include "RimStatisticsCaseEvaluator.h"
-#include "RigMainGrid.h"
-#include "cafPdmUiTextEditor.h"
-#include "cafPdmUiLineEditor.h"
-#include "cafPdmUiPushButtonEditor.h"
-#include "RiuMainWindow.h"
-#include "RimUiTreeModelPdm.h"
-#include "cafProgressInfo.h"
+#include "RigCaseData.h"
 #include "RimCaseCollection.h"
-
-
-#include "cafPdmFieldCvfMat4d.h"
-#include "cafPdmFieldCvfColor.h"
-#include "RimResultSlot.h"
-#include "RimCellEdgeResultSlot.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "RimWellCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
-
+#include "RimIdenticalGridCaseGroup.h"
 #include "RimReservoirCellResultsCacher.h"
+#include "RimReservoirView.h"
+#include "RimResultSlot.h"
+#include "RimStatisticsCaseEvaluator.h"
+#include "RimUiTreeModelPdm.h"
+#include "RimWellCollection.h"
+#include "RiuMainWindow.h"
+
+#include "cafPdmUiPushButtonEditor.h"
+#include "cafPdmUiTextEditor.h"
+#include "cafProgressInfo.h"
 
 namespace caf {
     template<>
diff --git a/ApplicationCode/ProjectDataModel/RimStatisticsCaseCollection.cpp b/ApplicationCode/ProjectDataModel/RimStatisticsCaseCollection.cpp
index 40daa70a63..a5fb4e94a6 100644
--- a/ApplicationCode/ProjectDataModel/RimStatisticsCaseCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimStatisticsCaseCollection.cpp
@@ -16,23 +16,9 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
-#include "RimReservoirView.h"
-
 #include "RimStatisticsCaseCollection.h"
-#include "RimIdenticalGridCaseGroup.h"
-#include "RimCaseCollection.h"
 
-#include "cafPdmFieldCvfMat4d.h"
-#include "cafPdmFieldCvfColor.h"
-#include "RimResultSlot.h"
-#include "RimCellEdgeResultSlot.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "RimWellCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimReservoirCellResultsCacher.h"
+#include "RimIdenticalGridCaseGroup.h"
 
 
 CAF_PDM_SOURCE_INIT(RimStatisticsCaseCollection, "RimStatisticalCollection");
diff --git a/ApplicationCode/ProjectDataModel/RimStatisticsCaseCollection.h b/ApplicationCode/ProjectDataModel/RimStatisticsCaseCollection.h
index e7c0059363..699c28a5c6 100644
--- a/ApplicationCode/ProjectDataModel/RimStatisticsCaseCollection.h
+++ b/ApplicationCode/ProjectDataModel/RimStatisticsCaseCollection.h
@@ -23,8 +23,8 @@
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 
-#include "RimStatisticsCase.h"
-
+class RimStatisticsCase;
+class RimIdenticalGridCaseGroup;
 
 
 //==================================================================================================
@@ -44,6 +44,4 @@ public:
 
     RimIdenticalGridCaseGroup* parentCaseGroup();
 
-private:
-
 };
diff --git a/ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.cpp b/ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.cpp
index 4d8a499d8c..6d49322ed4 100644
--- a/ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.cpp
+++ b/ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.cpp
@@ -15,30 +15,18 @@
 //  for more details.
 //
 /////////////////////////////////////////////////////////////////////////////////
-//#include "RiaStdInclude.h"
 
 #include "RimStatisticsCaseEvaluator.h"
+
 #include "RigCaseCellResultsData.h"
-#include "RimReservoirView.h"
-#include "RimCase.h"
 #include "RigCaseData.h"
 #include "RigStatisticsMath.h"
 #include "RimReservoirCellResultsCacher.h"
 
-
-#include "cafPdmFieldCvfMat4d.h"
-#include "cafPdmFieldCvfColor.h"
-#include "RimResultSlot.h"
-#include "RimCellEdgeResultSlot.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "RimWellCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
-
-//#include "RigCaseData.h"
-#include <QDebug>
 #include "cafProgressInfo.h"
 
+#include <QDebug>
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.h b/ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.h
index 7c825c8b8d..906ad17c7d 100644
--- a/ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.h
+++ b/ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.h
@@ -18,15 +18,13 @@
 
 #pragma once
 
-#include "cvfBase.h"
-#include "cvfObject.h"
-#include "cvfCollection.h"
+#include "RimDefines.h"
+#include "RimStatisticsCase.h"
+
 #include <vector>
 #include <math.h>
 
 #include <QPair>
-#include "RimDefines.h"
-#include "RimStatisticsCase.h"
 
 class RimCase;
 class RigCaseData;
diff --git a/ApplicationCode/ProjectDataModel/RimTools.cpp b/ApplicationCode/ProjectDataModel/RimTools.cpp
index 3ab3439da0..453bc259ba 100644
--- a/ApplicationCode/ProjectDataModel/RimTools.cpp
+++ b/ApplicationCode/ProjectDataModel/RimTools.cpp
@@ -16,30 +16,12 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 #include "RimTools.h"
 
-#include "RivWellPathCollectionPartMgr.h"
-#include "RimProject.h"
-#include "RimCase.h"
-#include "RimIdenticalGridCaseGroup.h"
-#include "RimScriptCollection.h"
-#include "RimReservoirView.h"
-#include "RimReservoirCellResultsCacher.h"
-#include "RimCaseCollection.h"
-#include "RimResultSlot.h"
-#include "RimCellEdgeResultSlot.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "RimWellCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimWellPathCollection.h"
-#include "RivWellPathPartMgr.h"
-#include "RimWellPathCollection.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimOilField.h"
-#include "RimAnalysisModels.h"
 #include "RiaApplication.h"
+#include "RimProject.h"
+
+#include <QFileInfo>
 
 //--------------------------------------------------------------------------------------------------
 /// 
diff --git a/ApplicationCode/ProjectDataModel/RimTools.h b/ApplicationCode/ProjectDataModel/RimTools.h
index 0d301ff002..e39f961043 100644
--- a/ApplicationCode/ProjectDataModel/RimTools.h
+++ b/ApplicationCode/ProjectDataModel/RimTools.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-class RimProject;
+#include <QString>
 
 class RimTools
 {
diff --git a/ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp b/ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp
index 68ec961b7c..dc340cb014 100644
--- a/ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp
+++ b/ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp
@@ -16,47 +16,34 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
 #include "RimUiTreeModelPdm.h"
-#include "RimCellRangeFilter.h"
-#include "RimCellRangeFilterCollection.h"
 
-#include "cafPdmObject.h"
-#include "RimCellPropertyFilter.h"
-#include "RimCellPropertyFilterCollection.h"
-
-#include "RimReservoirView.h"
-#include "RiuViewer.h"
-#include "RimCalcScript.h"
 #include "RiaApplication.h"
-#include "RiuMainWindow.h"
+#include "RigGridManager.h"
+#include "RimAnalysisModels.h"
+#include "RimCase.h"
+#include "RimCaseCollection.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "RimCellRangeFilterCollection.h"
+#include "RimIdenticalGridCaseGroup.h"
+#include "RimInputCase.h"
 #include "RimInputProperty.h"
 #include "RimInputPropertyCollection.h"
-#include "cafPdmField.h"
-#include "RimInputCase.h"
-#include "RimStatisticsCase.h"
-#include "RimResultCase.h"
-#include "RigGridManager.h"
-#include "RimCase.h"
-#include "RigCaseData.h"
 #include "RimMimeData.h"
-#include "RimCaseCollection.h"
-#include "RimIdenticalGridCaseGroup.h"
-#include "RimProject.h"
-#include "RimScriptCollection.h"
-#include "RimWellCollection.h"
-#include "cafPdmFieldCvfMat4d.h"
-#include "cafPdmFieldCvfColor.h"
-#include "RimResultSlot.h"
-#include "RimCellEdgeResultSlot.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimReservoirCellResultsCacher.h"
-#include "RimWellPathCollection.h"
 #include "RimOilField.h"
-#include "RimAnalysisModels.h"
+#include "RimProject.h"
+#include "RimReservoirView.h"
+#include "RimResultCase.h"
+#include "RimScriptCollection.h"
+#include "RimStatisticsCase.h"
 #include "RimUiTreeView.h"
+#include "RimWellCollection.h"
+#include "RimWellPathCollection.h"
 
+#include "cvfAssert.h"
+
+#include <QClipboard>
+#include <QFileSystemWatcher>
 
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp b/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp
index 60bde2559f..2887bbd1c4 100644
--- a/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp
@@ -64,6 +64,8 @@
 #include "RimProject.h"
 #include "RimOilField.h"
 #include "RimAnalysisModels.h"
+#include "RimInputProperty.h"
+#include "RigSingleWellResultsData.h"
 
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/RimWell.cpp b/ApplicationCode/ProjectDataModel/RimWell.cpp
index 76f740cbe2..9a3a221ecc 100644
--- a/ApplicationCode/ProjectDataModel/RimWell.cpp
+++ b/ApplicationCode/ProjectDataModel/RimWell.cpp
@@ -16,22 +16,13 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-//#include "RiaStdInclude.h"
 #include "RimWell.h"
 
-
-#include "cafAppEnum.h"
-#include "cafPdmField.h"
-#include "RivReservoirViewPartMgr.h"
+#include "RigSingleWellResultsData.h"
 #include "RimReservoirView.h"
 #include "RimWellCollection.h"
-#include "cafPdmFieldCvfMat4d.h"
-#include "cafPdmFieldCvfColor.h"
-#include "RimResultSlot.h"
-#include "RimCellEdgeResultSlot.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "RimCellRangeFilterCollection.h"
+
+#include "cvfMath.h"
 
 CAF_PDM_SOURCE_INIT(RimWell, "Well");
 
diff --git a/ApplicationCode/ProjectDataModel/RimWell.h b/ApplicationCode/ProjectDataModel/RimWell.h
index 32e724e536..1e591f85c7 100644
--- a/ApplicationCode/ProjectDataModel/RimWell.h
+++ b/ApplicationCode/ProjectDataModel/RimWell.h
@@ -22,11 +22,15 @@
 #include "cafPdmObject.h"
 #include "cafPdmPointer.h"
 #include "cafAppEnum.h"
-#include "cafPdmFieldCvfColor.h"
 
-#include "RigSingleWellResultsData.h"
+#include "cvfObject.h"
 
+// Include to make Pdm work for cvf::Color
+#include "cafPdmFieldCvfColor.h"    
+
+class RigSingleWellResultsData;
 class RimReservoirView;
+
 //==================================================================================================
 ///  
 ///  
diff --git a/ApplicationCode/ProjectDataModel/RimWellCollection.cpp b/ApplicationCode/ProjectDataModel/RimWellCollection.cpp
index 0c9783a885..710e1948a3 100644
--- a/ApplicationCode/ProjectDataModel/RimWellCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimWellCollection.cpp
@@ -18,19 +18,13 @@
 
 #include "RimWellCollection.h"
 
-#include "cafAppEnum.h"
-#include "cafPdmFieldCvfColor.h"
-#include "cafPdmFieldCvfMat4d.h"
-#include "RimReservoirView.h"
-
-#include "RimResultSlot.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimCellPropertyFilterCollection.h"
-
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimCellEdgeResultSlot.h"
 #include "RiaApplication.h"
 #include "RiaPreferences.h"
+#include "RigSingleWellResultsData.h"
+#include "RimReservoirView.h"
+#include "RimWell.h"
+#include "RivReservoirViewPartMgr.h"
+
 
 namespace caf
 {
diff --git a/ApplicationCode/ProjectDataModel/RimWellCollection.h b/ApplicationCode/ProjectDataModel/RimWellCollection.h
index 515574bf41..8ca7232006 100644
--- a/ApplicationCode/ProjectDataModel/RimWellCollection.h
+++ b/ApplicationCode/ProjectDataModel/RimWellCollection.h
@@ -22,11 +22,14 @@
 #include "cafPdmObject.h"
 #include "cafPdmPointer.h"
 #include "cafAppEnum.h"
+
+// Include to make Pdm work for cvf::Color
+#include "cafPdmFieldCvfColor.h"    
+
 #include <QString>
 
-#include "RimWell.h"
-
 class RimReservoirView;
+class RimWell;
 
 //==================================================================================================
 ///  
diff --git a/ApplicationCode/ProjectDataModel/RimWellPath.cpp b/ApplicationCode/ProjectDataModel/RimWellPath.cpp
index 18e1b7bb2c..29ed5040b9 100644
--- a/ApplicationCode/ProjectDataModel/RimWellPath.cpp
+++ b/ApplicationCode/ProjectDataModel/RimWellPath.cpp
@@ -16,37 +16,16 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
-
-#include "cafAppEnum.h"
-#include "cafPdmField.h"
-#include "RiaApplication.h"
-
 #include "RimWellPath.h"
-#include "RimWellPathCollection.h"
-#include "RimProject.h"
-#include "RimCase.h"
-#include "RivWellPathPartMgr.h"
+
 #include "RifJsonEncodeDecode.h"
-#include "RimIdenticalGridCaseGroup.h"
-#include "RimScriptCollection.h"
-#include "RimReservoirView.h"
-#include "RimReservoirCellResultsCacher.h"
-#include "RimCaseCollection.h"
-#include "RimResultSlot.h"
-#include "RimCellEdgeResultSlot.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "RimWellCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimOilField.h"
-#include "RimAnalysisModels.h"
-
-#include <fstream>
-#include <limits>
+#include "RimProject.h"
 #include "RimTools.h"
+#include "RimWellPathCollection.h"
+#include "RivWellPathPartMgr.h"
 
+#include <QDir>
+#include <QFileInfo>
 
 CAF_PDM_SOURCE_INIT(RimWellPath, "WellPath");
 
diff --git a/ApplicationCode/ProjectDataModel/RimWellPath.h b/ApplicationCode/ProjectDataModel/RimWellPath.h
index 4d25a145b9..068f84d4f8 100644
--- a/ApplicationCode/ProjectDataModel/RimWellPath.h
+++ b/ApplicationCode/ProjectDataModel/RimWellPath.h
@@ -22,7 +22,10 @@
 #include "cafPdmObject.h"
 #include "cafPdmPointer.h"
 #include "cafAppEnum.h"
-#include "cafPdmFieldCvfColor.h"
+
+// Include to make Pdm work for cvf::Color
+#include "cafPdmFieldCvfColor.h"    
+
 #include "RigWellPath.h"
 
 class RimProject;
diff --git a/ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp b/ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
index 5483feee76..c76a5f0df3 100644
--- a/ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
@@ -16,34 +16,20 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RiaStdInclude.h"
-
-#include "cafAppEnum.h"
-#include "cafPdmFieldCvfColor.h"
-#include "cafProgressInfo.h"
-
 #include "RimWellPathCollection.h"
-#include "RimWellPath.h"
-#include "RivWellPathCollectionPartMgr.h"
-#include "RimProject.h"
-#include "RimCase.h"
-#include "RimIdenticalGridCaseGroup.h"
-#include "RimScriptCollection.h"
-#include "RimReservoirView.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimReservoirCellResultsCacher.h"
-#include "RimCaseCollection.h"
-#include "RimResultSlot.h"
-#include "RimCellEdgeResultSlot.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "RimWellCollection.h"
-#include "RimOilField.h"
-#include "RimAnalysisModels.h"
-#include <fstream>
 
 #include "RiaApplication.h"
 #include "RiaPreferences.h"
+#include "RimProject.h"
+#include "RimWellPath.h"
+#include "RivWellPathCollectionPartMgr.h"
+
+#include "cafProgressInfo.h"
+
+#include <QFile>
+#include <QFileInfo>
+
+#include <fstream>
 
 namespace caf
 {
diff --git a/ApplicationCode/ProjectDataModel/RimWellPathCollection.h b/ApplicationCode/ProjectDataModel/RimWellPathCollection.h
index b734bd5f97..7d30e10fca 100644
--- a/ApplicationCode/ProjectDataModel/RimWellPathCollection.h
+++ b/ApplicationCode/ProjectDataModel/RimWellPathCollection.h
@@ -22,12 +22,20 @@
 #include "cafPdmObject.h"
 #include "cafPdmPointer.h"
 #include "cafAppEnum.h"
-#include <QString>
 
-#include "RimWellPath.h"
+// Include to make Pdm work for cvf::Color
+#include "cafPdmFieldCvfColor.h"    
+
+#include "cvfObject.h"
+
+#include <QString>
 
 class RivWellPathCollectionPartMgr;
 class RimWellPathAsciiFileReader;
+class RimWellPath;
+class RimProject;
+class RigWellPath;
+
 
 //==================================================================================================
 ///  
diff --git a/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp b/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
index fa5fc419fd..043e18c5eb 100644
--- a/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
+++ b/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
@@ -43,6 +43,7 @@
 #include "RiaApplication.h"
 #include "RiaPreferences.h"
 #include "RiaSocketDataTransfer.h"
+#include "RimInputProperty.h"
 
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/UserInterface/RiuMainWindow.cpp b/ApplicationCode/UserInterface/RiuMainWindow.cpp
index 7a2d8f163d..18f509d09c 100644
--- a/ApplicationCode/UserInterface/RiuMainWindow.cpp
+++ b/ApplicationCode/UserInterface/RiuMainWindow.cpp
@@ -19,51 +19,42 @@
 #include "RiaStdInclude.h"
 
 #include "RiuMainWindow.h"
+
 #include "RiaApplication.h"
-
-#include "RimProject.h"
-#include "RimAnalysisModels.h"
-#include "RimOilField.h"
-#include "RimReservoirView.h"
-#include "RimUiTreeView.h"
-#include "RimCase.h"
-#include "RimResultSlot.h"
-#include "RimCellPropertyFilterCollection.h"
-#include "RimWellCollection.h"
-#include "RimReservoirCellResultsCacher.h"
-#include "RimCaseCollection.h"
-#include "RimWellPathCollection.h"
-
-#include "RimUiTreeModelPdm.h"
-
 #include "RiaBaseDefs.h"
-#include "RiuViewer.h"
-#include "RiuResultInfoPanel.h"
-#include "RiuProcessMonitor.h"
-#include "RiuMultiCaseImportDialog.h"
-
 #include "RiaPreferences.h"
-
-#include "RigCaseCellResultsData.h"
-
-#include "cafAnimationToolBar.h"
-#include "cafPdmUiPropertyView.h"
-#include "cafAboutDialog.h"
-#include "cvfTimer.h"
-
-#include "cafPdmFieldCvfMat4d.h"
-
-#include "RimIdenticalGridCaseGroup.h"
-#include "RimScriptCollection.h"
-#include "RimCellEdgeResultSlot.h"
-#include "RimCellRangeFilterCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RiuWellImportWizard.h"
-#include "RimCalcScript.h"
-#include "RimTools.h"
 #include "RiaRegressionTest.h"
-#include "cafPdmUiPropertyDialog.h"
+#include "RigCaseCellResultsData.h"
+#include "RimAnalysisModels.h"
+#include "RimCase.h"
+#include "RimCaseCollection.h"
+#include "RimCellPropertyFilterCollection.h"
+#include "RimCommandObject.h"
+#include "RimFaultCollection.h"
+#include "RimOilField.h"
+#include "RimProject.h"
+#include "RimReservoirCellResultsCacher.h"
+#include "RimReservoirView.h"
+#include "RimResultSlot.h"
+#include "RimTools.h"
+#include "RimUiTreeModelPdm.h"
+#include "RimUiTreeView.h"
+#include "RimWellCollection.h"
+#include "RimWellPathCollection.h"
+#include "RimWellPathImport.h"
+#include "RiuMultiCaseImportDialog.h"
+#include "RiuProcessMonitor.h"
+#include "RiuResultInfoPanel.h"
+#include "RiuViewer.h"
+#include "RiuWellImportWizard.h"
 
+#include "cafAboutDialog.h"
+#include "cafAnimationToolBar.h"
+#include "cafPdmFieldCvfMat4d.h"
+#include "cafPdmUiPropertyDialog.h"
+#include "cafPdmUiPropertyView.h"
+
+#include "cvfTimer.h"
 
 
 //==================================================================================================