diff --git a/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp b/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp
index 63c50908f3..dedd0e78f0 100644
--- a/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp
+++ b/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp
@@ -21,7 +21,6 @@
 #include "RifReaderEclipseOutput.h"
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
-#include "RigResultAccessor.h"
 #include "RigResultAccessorFactory.h"
 
 #include "cafProgressInfo.h"
diff --git a/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp b/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp
index 712c4e1e45..99fa9bf715 100644
--- a/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp
@@ -51,7 +51,6 @@
 #include "RivCellEdgeEffectGenerator.h"
 #include "RivSourceInfo.h"
 #include "cvfStructGridGeometryGenerator.h"
-#include "RigResultAccessor.h"
 #include "RigResultAccessorFactory.h"
 #include "RivResultToTextureMapper.h"
 #include "RivTextureCoordsCreator.h"
diff --git a/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp b/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp
index 59163d5fdb..ff97711e3d 100644
--- a/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp
+++ b/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp
@@ -27,7 +27,6 @@
 #include "RigPipeInCellEvaluator.h"
 #include "RivResultToTextureMapper.h"
 #include "RimWellCollection.h"
-#include "RigResultAccessor.h"
 
 //--------------------------------------------------------------------------------------------------
 /// 
diff --git a/ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.cpp b/ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.cpp
index 83af15a0dc..778b4d19c0 100644
--- a/ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.cpp
+++ b/ApplicationCode/ProjectDataModel/RimStatisticsCaseEvaluator.cpp
@@ -20,7 +20,6 @@
 
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
-#include "RigResultAccessor.h"
 #include "RigResultAccessorFactory.h"
 #include "RigResultModifier.h"
 #include "RigResultModifierFactory.h"
diff --git a/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.h b/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.h
index 15d2ebd99f..6c1d890dd7 100644
--- a/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.h
+++ b/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.h
@@ -19,13 +19,13 @@
 #pragma once
 
 #include "RifReaderInterface.h"
+#include "RigResultAccessor.h"
 #include "RimDefines.h"
 
 #include "cvfStructGridScalarDataAccess.h"
 
 class RigActiveCellInfo;
 class RigGridBase;
-class RigResultAccessor;
 
 class RigResultAccessorFactory
 {
diff --git a/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp b/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
index df9106bcf8..a8257f834b 100644
--- a/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
+++ b/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
@@ -42,7 +42,6 @@
 #include "RiuMainWindow.h"
 #include "RiuProcessMonitor.h"
 #include "RigResultAccessorFactory.h"
-#include "RigResultAccessor.h"
 
 
 //--------------------------------------------------------------------------------------------------