diff --git a/ApplicationCode/Application/RiaMemoryCleanup.cpp b/ApplicationCode/Application/RiaMemoryCleanup.cpp
index 14445beae5..48c3af41ce 100644
--- a/ApplicationCode/Application/RiaMemoryCleanup.cpp
+++ b/ApplicationCode/Application/RiaMemoryCleanup.cpp
@@ -33,6 +33,7 @@
 #include "cafPdmUiListEditor.h"
 #include "cafPdmUiPushButtonEditor.h"
 #include "cafPdmUiTreeSelectionEditor.h"
+#include "RigEclipseResultInfo.h"
 
 //==================================================================================================
 ///
diff --git a/ApplicationCode/Application/RiaMemoryCleanup.h b/ApplicationCode/Application/RiaMemoryCleanup.h
index 81ae0b5b29..2e87b9121e 100644
--- a/ApplicationCode/Application/RiaMemoryCleanup.h
+++ b/ApplicationCode/Application/RiaMemoryCleanup.h
@@ -18,9 +18,6 @@
 
 #pragma once
 
-#include "RigFemResultAddress.h"
-#include "RigEclipseResultInfo.h"
-#include "RigEclipseResultAddress.h"
 
 #include "cafPdmField.h"
 #include "cafPdmChildArrayField.h"
@@ -30,6 +27,8 @@
 
 class RimCase;
 class Rim3dView;
+class RigFemResultAddress;
+class RigEclipseResultAddress;
 
 class RiaMemoryCleanup : public caf::PdmObject
 {
diff --git a/ApplicationCode/Commands/ApplicationCommands/RicShowMemoryCleanupDialogFeature.cpp b/ApplicationCode/Commands/ApplicationCommands/RicShowMemoryCleanupDialogFeature.cpp
index 2c378f0ece..8bfe0f8e33 100644
--- a/ApplicationCode/Commands/ApplicationCommands/RicShowMemoryCleanupDialogFeature.cpp
+++ b/ApplicationCode/Commands/ApplicationCommands/RicShowMemoryCleanupDialogFeature.cpp
@@ -20,6 +20,10 @@
 
 #include "RiaApplication.h"
 #include "RiaMemoryCleanup.h"
+
+#include "RigEclipseResultAddress.h"
+#include "RigFemResultAddress.h"
+
 #include "RiuMainWindow.h"
 
 #include "cafPdmUiPropertyViewDialog.h"