Remove obsolete includes and reorder

ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp

@@ -18,16 +18,18 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RigEclipseWellLogExtractor.h"
-#include <map>
+
 #include "RigEclipseCaseData.h"
-#include "RigWellPath.h"
+#include "RigMainGrid.h"
 #include "RigResultAccessor.h"
+#include "RigWellLogExtractionTools.h"
+#include "RigWellPath.h"
+#include "RigWellPathIntersectionTools.h"
+
 #include "cvfBoundingBox.h"
 #include "cvfGeometryTools.h"
 
-#include "RigWellLogExtractionTools.h"
-#include "RigMainGrid.h"
-#include "RigWellPathIntersectionTools.h"
+#include <map>
 
 //==================================================================================================
 /// 

ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.h

@@ -21,19 +21,12 @@
 
 #include "RigWellLogExtractor.h"
 
-#include "cvfBase.h"
-#include "cvfObject.h"
-#include "cvfMath.h"
-#include "cvfVector3.h"
-
-#include <vector>
-#include "cvfStructGrid.h"
-#include "RigWellPathIntersectionTools.h"
-
 class RigEclipseCaseData;
 class RigWellPath;
 class RigResultAccessor;
 
+struct WellPathCellIntersectionInfo;
+
 namespace cvf {
     class BoundingBox;
 }