diff --git a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp
index e9ebe16011..1a704b5be9 100644
--- a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp
+++ b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp
@@ -19,6 +19,7 @@
 #include "RimAnalysisPlot.h"
 
 #include "RiaPreferences.h"
+#include "RiaSummaryCurveDefinition.h"
 #include "RiaTextStringTools.h"
 
 #include "RiuGroupedBarChartBuilder.h"
diff --git a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.h b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.h
index 1ffcf91923..78a28b2666 100644
--- a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.h
+++ b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.h
@@ -18,8 +18,6 @@
 
 #pragma once
 
-#include "RiaSummaryCurveDefinition.h"
-
 #include "RimPlot.h"
 #include "RimPlotDataFilterItem.h"
 #include "RimSummaryCaseCollection.h"
@@ -37,6 +35,7 @@ class RiaSummaryCurveDefinitionAnalyser;
 class RimPlotAxisPropertiesInterface;
 class RimPlotAxisProperties;
 class RimPlotDataFilterCollection;
+class RiaSummaryCurveDefinition;
 
 //==================================================================================================
 ///
diff --git a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotCollection.cpp
index 6fcd1cc634..d4d444ab97 100644
--- a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotCollection.cpp
+++ b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotCollection.cpp
@@ -18,6 +18,8 @@
 
 #include "RimAnalysisPlotCollection.h"
 
+#include "RiaSummaryCurveDefinition.h"
+
 #include "RimAnalysisPlot.h"
 #include "RimPlotDataFilterCollection.h"
 #include "RimProject.h"
diff --git a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotDataEntry.h b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotDataEntry.h
index b0551574ed..2b71a3f2b4 100644
--- a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotDataEntry.h
+++ b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotDataEntry.h
@@ -18,7 +18,6 @@
 
 #pragma once
 
-#include "RiaSummaryCurveDefinition.h"
 #include "RifEclipseSummaryAddress.h"
 #include "cafPdmChildField.h"
 #include "cafPdmField.h"
@@ -28,6 +27,7 @@
 class RimSummaryCase;
 class RimSummaryAddress;
 class RimSummaryCaseCollection;
+class RiaSummaryCurveDefinition;
 
 class RimAnalysisPlotDataEntry : public caf::PdmObject
 {
diff --git a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.h b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.h
index 457b43b41e..ed4fecbeb9 100644
--- a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.h
+++ b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterItem.h
@@ -28,8 +28,6 @@
 
 #include "RimSummaryCaseCollection.h"
 
-#include "RiaSummaryCurveDefinition.h"
-
 #include <QDateTime>
 
 class RiuSummaryQwtPlot;
diff --git a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlot.h b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlot.h
index 1703972066..c89805bc2d 100644
--- a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlot.h
+++ b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlot.h
@@ -18,7 +18,8 @@
 
 #pragma once
 
-#include "RiaSummaryCurveDefinition.h"
+#include "RiaSummaryCurveDefinition.h" // use of caf::Signal requires this include
+
 #include "RimAbstractCorrelationPlot.h"
 #include "RimSummaryCaseCollection.h"
 
diff --git a/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunctionWeight.cpp b/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunctionWeight.cpp
index 024288d34d..173de72921 100644
--- a/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunctionWeight.cpp
+++ b/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunctionWeight.cpp
@@ -19,6 +19,7 @@
 #include "RimCustomObjectiveFunctionWeight.h"
 
 #include "RiaStdStringTools.h"
+#include "RiaSummaryCurveDefinition.h"
 
 #include "RimCustomObjectiveFunction.h"
 #include "RimEnsembleCurveSet.h"
diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp
index 3eee5f336a..7905531153 100644
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp
@@ -19,6 +19,7 @@
 #include "RimEnsembleCurveFilter.h"
 
 #include "RiaCurveDataTools.h"
+#include "RiaSummaryCurveDefinition.h"
 
 #include "RimCustomObjectiveFunction.h"
 #include "RimCustomObjectiveFunctionCollection.h"
diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
index 1d6634e417..0ef42406ba 100644
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
@@ -25,6 +25,7 @@
 #include "RiaPreferences.h"
 #include "RiaResultNames.h"
 #include "RiaStatisticsTools.h"
+#include "RiaSummaryCurveDefinition.h"
 #include "RiaSummaryTools.h"
 
 #include "RifReaderEclipseSummary.h"
diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.h
index 8064ea8be5..8c6c2bbd04 100644
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.h
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.h
@@ -26,7 +26,6 @@
 
 #include "RiaDefines.h"
 #include "RiaQDateTimeTools.h"
-#include "RiaSummaryCurveDefinition.h"
 
 #include "RifEclipseSummaryAddressQMetaType.h"
 #include "RimStackablePlotCurve.h"
@@ -40,6 +39,7 @@ class RimSummaryFilter_OBSOLETE;
 class RiuQwtPlotCurve;
 class RimSummaryCurveAutoName;
 class RimSummaryAddress;
+class RiaSummaryCurveDefinition;
 
 //==================================================================================================
 ///
diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h
index 28ff195688..645dc3067c 100644
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h
@@ -20,7 +20,6 @@
 
 #include "RiaDefines.h"
 #include "RiaQDateTimeTools.h"
-#include "RiaSummaryCurveDefinition.h"
 
 #include "RifEclipseSummaryAddress.h"
 
@@ -54,6 +53,7 @@ class RimSummaryPlotNameHelper;
 class RimPlotTemplateFileItem;
 class RimSummaryPlotFilterTextCurveSetEditor;
 class RimSummaryPlotSourceStepping;
+class RiaSummaryCurveDefinition;
 
 class QwtInterval;
 class QwtPlotCurve;
diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp
index cc6d5b2070..f1552e11fe 100644
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp
@@ -19,6 +19,7 @@
 #include "RimSummaryPlotAxisFormatter.h"
 
 #include "RiaDefines.h"
+#include "RiaSummaryCurveDefinition.h"
 
 #include "RifSummaryReaderInterface.h"
 
diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.h
index 6a61a920ce..be45af8018 100644
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.h
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.h
@@ -24,11 +24,10 @@
 
 #include <qwt_plot.h>
 
-#include "RiaSummaryCurveDefinition.h"
-
 class RimAsciiDataCurve;
 class RimSummaryCurve;
 class RimPlotAxisProperties;
+class RiaSummaryCurveDefinition;
 
 class RiuQwtPlotWidget;
 
diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.h
index 681c1aa1f3..794e5d2d2d 100644
--- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.h
+++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.h
@@ -15,10 +15,9 @@
 //  for more details.
 //
 /////////////////////////////////////////////////////////////////////////////////
-#include "cafPdmObject.h"
 
-#include "RiaSummaryCurveDefinition.h"
 #include "cafPdmField.h"
+#include "cafPdmObject.h"
 #include "cafPdmPtrArrayField.h"
 
 using SummarySource = caf::PdmObject;
diff --git a/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionDialog.h b/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionDialog.h
index 6d4aa3907f..30a17454aa 100644
--- a/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionDialog.h
+++ b/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionDialog.h
@@ -18,17 +18,19 @@
 
 #pragma once
 
-#include "RiaSummaryCurveDefinition.h"
-
 #include <QDialog>
 
 #include <memory>
 
-class QLabel;
-
+class RiaSummaryCurveDefinition;
+class RifEclipseSummaryAddress;
+class RimSummaryCase;
+class RimSummaryCaseCollection;
 class RiuSummaryVectorSelectionUi;
 class RiuSummaryVectorSelectionWidgetCreator;
 
+class QLabel;
+
 //==================================================================================================
 ///
 ///