diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.cpp
index 21c163b6fa..408ff43bed 100644
--- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.cpp
+++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.cpp
@@ -25,8 +25,6 @@
 #include "RimSummaryCalculation.h"
 #include "RimSummaryCalculationCollection.h"
 
-#include "RiuCalculationsContextMenuManager.h"
-
 #include "cafPdmUiListEditor.h"
 #include "cafPdmUiPushButtonEditor.h"
 #include "cafPdmUiTreeSelectionEditor.h"
diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.h b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.h
index 6a4f3af0f5..e43afe5ba7 100644
--- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.h
+++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.h
@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include "RiuCalculationsContextMenuManager.h"
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 #include "cafPdmPtrField.h"
@@ -25,7 +26,6 @@
 
 class RimSummaryCalculationCollection;
 class RimSummaryCalculation;
-class RiuCalculationsContextMenuManager;
 
 //==================================================================================================
 /// 
diff --git a/ApplicationCode/UserInterface/RiuCalculationsContextMenuManager.cpp b/ApplicationCode/UserInterface/RiuCalculationsContextMenuManager.cpp
index ac55236bc5..96f7527f1b 100644
--- a/ApplicationCode/UserInterface/RiuCalculationsContextMenuManager.cpp
+++ b/ApplicationCode/UserInterface/RiuCalculationsContextMenuManager.cpp
@@ -18,6 +18,7 @@
 
 #include "RiuCalculationsContextMenuManager.h"
 #include "RimSummaryCalculationCollection.h"
+#include "SummaryPlotCommands/RicSummaryCurveCalculator.h"
 #include <QMenu>
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/UserInterface/RiuCalculationsContextMenuManager.h b/ApplicationCode/UserInterface/RiuCalculationsContextMenuManager.h
index 21e755210c..d8a130cf57 100644
--- a/ApplicationCode/UserInterface/RiuCalculationsContextMenuManager.h
+++ b/ApplicationCode/UserInterface/RiuCalculationsContextMenuManager.h
@@ -18,7 +18,6 @@
 
 #pragma once
 
-#include "SummaryPlotCommands/RicSummaryCurveCalculator.h"
 #include "cafPdmChildArrayField.h"
 #include "cafPdmObject.h"
 #include "cafPdmField.h"
@@ -26,8 +25,10 @@
 #include <QAction>
 #include <QWidget>
 #include <memory>
+#include <map>
 
 class RimSummaryCalculationVariable;
+class RicSummaryCurveCalculator;
 
 //==================================================================================================
 ///