diff --git a/ApplicationCode/Commands/RicExportToLasFileFeature.cpp b/ApplicationCode/Commands/RicExportToLasFileFeature.cpp
index dc2fad0a9b..834187bf89 100644
--- a/ApplicationCode/Commands/RicExportToLasFileFeature.cpp
+++ b/ApplicationCode/Commands/RicExportToLasFileFeature.cpp
@@ -19,13 +19,16 @@
 
 #include "RicExportToLasFileFeature.h"
 
-#include "RiaApplication.h"
 #include "RicExportToLasFileResampleUi.h"
-#include "RigLasFileExporter.h"
-#include "RimWellLogCurve.h"
-
 #include "WellLogCommands/RicWellLogPlotCurveFeatureImpl.h"
 
+#include "RiaApplication.h"
+
+#include "RigLasFileExporter.h"
+#include "RigWellLogCurveData.h"
+
+#include "RimWellLogCurve.h"
+
 #include "cafPdmUiPropertyViewDialog.h"
 #include "cafSelectionManager.h"
   
diff --git a/ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.cpp b/ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.cpp
index 3e75586336..6332124856 100644
--- a/ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.cpp
+++ b/ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.cpp
@@ -22,6 +22,10 @@
 #include "RicWellLogPlotCurveFeatureImpl.h"
 #include "RicNewWellLogPlotFeatureImpl.h"
 
+#include "RiaApplication.h"
+
+#include "RigWellLogCurveData.h"
+
 #include "RimProject.h"
 #include "RimView.h"
 #include "RimWellLogExtractionCurve.h"
@@ -29,9 +33,8 @@
 #include "RimWellLogTrack.h"
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
-#include "RiuMainPlotWindow.h"
 
-#include "RiaApplication.h"
+#include "RiuMainPlotWindow.h"
 
 #include "cafSelectionManager.h"
 
diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellFlowRateCurve.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellFlowRateCurve.cpp
index 678b189ea7..d13e2028c2 100644
--- a/ApplicationCode/ProjectDataModel/Flow/RimWellFlowRateCurve.cpp
+++ b/ApplicationCode/ProjectDataModel/Flow/RimWellFlowRateCurve.cpp
@@ -18,14 +18,17 @@
 
 #include "RimWellFlowRateCurve.h"
 
+#include "WellLogCommands/RicWellLogPlotCurveFeatureImpl.h"
+
+#include "RigWellLogCurveData.h"
+
 #include "RimWellAllocationPlot.h"
+#include "RimWellLogPlot.h"
+#include "RimWellLogTrack.h"
 
 #include "RiuLineSegmentQwtPlotCurve.h"
 
 #include "qwt_plot.h"
-#include "RimWellLogPlot.h"
-#include "WellLogCommands/RicWellLogPlotCurveFeatureImpl.h"
-#include "RimWellLogTrack.h"
 
 
 
diff --git a/ApplicationCode/ProjectDataModel/RimWellLogCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogCurve.cpp
index 61e36ba395..c0d2e21a53 100644
--- a/ApplicationCode/ProjectDataModel/RimWellLogCurve.cpp
+++ b/ApplicationCode/ProjectDataModel/RimWellLogCurve.cpp
@@ -19,8 +19,9 @@
 
 #include "RimWellLogCurve.h"
 
-#include "RimWellLogPlot.h"
+#include "RigWellLogCurveData.h" 
 
+#include "RimWellLogPlot.h"
 #include "RimWellLogTrack.h"
 
 #include "RiuLineSegmentQwtPlotCurve.h"
diff --git a/ApplicationCode/ProjectDataModel/RimWellLogCurve.h b/ApplicationCode/ProjectDataModel/RimWellLogCurve.h
index df1dff236f..68a6f65653 100644
--- a/ApplicationCode/ProjectDataModel/RimWellLogCurve.h
+++ b/ApplicationCode/ProjectDataModel/RimWellLogCurve.h
@@ -20,7 +20,8 @@
 #pragma once
 
 #include "RimPlotCurve.h"
-#include "RigWellLogCurveData.h"
+
+#include "cvfObject.h"
 
 class RigWellLogCurveData;
 
diff --git a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp
index 3186516e75..7561182594 100644
--- a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp
+++ b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp
@@ -28,6 +28,7 @@
 #include "RigGeoMechCaseData.h"
 #include "RigGeoMechWellLogExtractor.h"
 #include "RigResultAccessorFactory.h"
+#include "RigWellLogCurveData.h"
 
 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
diff --git a/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp
index 93135dd956..b2dcd85067 100644
--- a/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp
+++ b/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp
@@ -19,14 +19,16 @@
 
 #include "RimWellLogFileCurve.h"
 
-#include "RimProject.h"
+#include "RigWellLogCurveData.h"
+
 #include "RimOilField.h"
-#include "RimWellPathCollection.h"
-#include "RimWellPath.h"
-#include "RimWellLogFileChannel.h"
+#include "RimProject.h"
 #include "RimWellLogFile.h"
-#include "RimWellLogTrack.h"
+#include "RimWellLogFileChannel.h"
 #include "RimWellLogPlot.h"
+#include "RimWellLogTrack.h"
+#include "RimWellPath.h"
+#include "RimWellPathCollection.h"
 
 #include "RiuWellLogTrack.h"
 #include "RiuLineSegmentQwtPlotCurve.h"
diff --git a/ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp b/ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp
index 4e4ecfbc23..8c131e0084 100644
--- a/ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp
+++ b/ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp
@@ -20,13 +20,15 @@
 #include "RimWellLogTrack.h"
 
 #include "RigStatisticsCalculator.h"
+#include "RigWellLogCurveData.h"
 
-#include "RimWellLogPlot.h"
+#include "RimWellFlowRateCurve.h"
 #include "RimWellLogCurve.h"
+#include "RimWellLogPlot.h"
 
-#include "RiuWellLogTrack.h"
-#include "RiuWellLogPlot.h"
 #include "RiuMainWindow.h"
+#include "RiuWellLogPlot.h"
+#include "RiuWellLogTrack.h"
 
 #include "cvfAssert.h"
 #include "cvfMath.h"
@@ -34,7 +36,6 @@
 #include "qwt_scale_engine.h"
 
 #include <math.h>
-#include "RimWellFlowRateCurve.h"
 
 #define RI_LOGPLOTTRACK_MINX_DEFAULT    -10.0
 #define RI_LOGPLOTTRACK_MAXX_DEFAULT    100.0
diff --git a/ApplicationCode/ReservoirDataModel/RigWellLogFile.cpp b/ApplicationCode/ReservoirDataModel/RigWellLogFile.cpp
index 38196efa7e..6c89a5a1b5 100644
--- a/ApplicationCode/ReservoirDataModel/RigWellLogFile.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigWellLogFile.cpp
@@ -19,6 +19,8 @@
 
 #include "RigWellLogFile.h"
 
+#include "RigWellLogCurveData.h"
+
 #include "RimWellLogCurve.h"
 
 #include "well.hpp"