Cleaned up includes

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

ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.cpp

@@ -24,13 +24,16 @@
 
 #include "RimIntersection.h"
 
+#include "RivHexGridIntersectionTools.h"
+
 #include "cafHexGridIntersectionTools/cafHexGridIntersectionTools.h"
 
 #include "cvfDrawableGeo.h"
+#include "cvfGeometryTools.h"
+#include "cvfPlane.h"
 #include "cvfPrimitiveSetDirect.h"
 #include "cvfPrimitiveSetIndexedUInt.h"
 #include "cvfScalarMapper.h"
-#include "cvfGeometryTools.h"
 
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.h

@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include "RivHexGridIntersectionTools.h"
-
 #include "cafPdmPointer.h"
 
 #include "cvfArray.h"
@@ -35,6 +33,8 @@ class RigMainGrid;
 class RigActiveCellInfo;
 class RigResultAccessor;
 class RimIntersection;
+class RivIntersectionHexGridInterface;
+class RivIntersectionVertexWeights;
 
 namespace cvf
 {

ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.cpp

@@ -36,6 +36,8 @@
 #include "RimLegendConfig.h"
 #include "RimTernaryLegendConfig.h"
 
+#include "RivHexGridIntersectionTools.h"
+#include "RivIntersectionGeometryGenerator.h"
 #include "RivIntersectionSourceInfo.h"
 #include "RivResultToTextureMapper.h"
 #include "RivScalarMapperUtils.h"
@@ -45,6 +47,7 @@
 #include "RiuGeoMechXfTensorResultAccessor.h"
 
 #include "cafTensor3.h"
+
 #include "cvfDrawableGeo.h"
 #include "cvfGeometryTools.h"
 #include "cvfModelBasicList.h"

ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.h

@@ -19,12 +19,11 @@
 
 #pragma once
 
-#include "RivIntersectionGeometryGenerator.h"
-
 #include "cvfBase.h"
 #include "cvfObject.h"
 #include "cvfColor4.h"
 #include "cvfVector3.h"
+#include "cvfArray.h"
 
 
 namespace cvf
@@ -32,14 +31,21 @@ namespace cvf
     class ModelBasicList;
     class Transform;
     class Part;
+    class ScalarMapper;
 }
 
-class RigMainGrid;
-class RimEclipseCellColors;
-class RimCellEdgeColors;
-class RimIntersection;
-class RigGeoMechCaseData;
+class RigFemPart;
 class RigFemResultAddress;
+class RigGeoMechCaseData;
+class RigMainGrid;
+class RigResultAccessor;
+class RimCellEdgeColors;
+class RimEclipseCellColors;
+class RimIntersection;
+class RivIntersectionGeometryGenerator;
+class RivIntersectionHexGridInterface;
+class RivIntersectionVertexWeights;
+
 
 //==================================================================================================
 ///