diff --git a/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp b/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp
index 7bfcea7c93..e8d1392a37 100644
--- a/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp
@@ -20,40 +20,21 @@
 
 #include "RivSimWellPipesPartMgr.h"
 
-#include "RigEclipseCaseData.h"
-#include "RigCell.h"
-#include "RigMainGrid.h"
-#include "RigSimulationWellCenterLineCalculator.h"
-
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimCellEdgeColors.h"
-#include "RimCellRangeFilterCollection.h"
-#include "RimEclipseCase.h"
-#include "RimEclipseCellColors.h"
-#include "RimEclipsePropertyFilterCollection.h"
 #include "Rim3dView.h"
-#include "RimReservoirCellResultsStorage.h"
 #include "RimSimWellInView.h"
 #include "RimSimWellInViewCollection.h"
 
 #include "RivPipeGeometryGenerator.h"
-#include "RivWellPathSourceInfo.h"
 #include "RivSimWellPipeSourceInfo.h"
+#include "RivSectionFlattner.h"
 
 #include "cafEffectGenerator.h"
-#include "cafPdmFieldCvfColor.h"
-#include "cafPdmFieldCvfMat4d.h"
+#include "cafDisplayCoordTransform.h"
 
 #include "cvfDrawableGeo.h"
 #include "cvfModelBasicList.h"
 #include "cvfPart.h"
-#include "cvfRay.h"
 #include "cvfScalarMapperDiscreteLinear.h"
-#include "cvfTransform.h"
-#include "cafDisplayCoordTransform.h"
-#include "RivSectionFlattner.h"
-#include "Rim2dIntersectionView.h"
-#include "RimIntersection.h"
 
 //--------------------------------------------------------------------------------------------------
 /// 
diff --git a/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.h b/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.h
index 1be06bbfc5..146f6ac47b 100644
--- a/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.h
+++ b/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.h
@@ -32,8 +32,6 @@ namespace cvf
 {
     class Part;
     class ModelBasicList;
-    class Transform;
-    class Effect;
     class DrawableGeo;
 }
 
@@ -45,7 +43,6 @@ namespace caf
 class RivPipeGeometryGenerator;
 class Rim3dView;
 class RimSimWellInView;
-class Rim2dIntersectionView;
 
 class RivSimWellPipesPartMgr : public cvf::Object
 {