diff --git a/ApplicationCode/ModelVisualization/RivWellPathCollectionPartMgr.h b/ApplicationCode/ModelVisualization/RivWellPathCollectionPartMgr.h
index e5ac6a5d0e..88b6dd86ca 100644
--- a/ApplicationCode/ModelVisualization/RivWellPathCollectionPartMgr.h
+++ b/ApplicationCode/ModelVisualization/RivWellPathCollectionPartMgr.h
@@ -18,13 +18,15 @@
 
 #pragma once
 
-
+#include "cvfBase.h"
 #include "cvfCollection.h"
 #include "cafPdmPointer.h"
 #include "cvfVector3.h"
 #include "cvfBoundingBox.h"
 #include "cvfTransform.h"
 
+#include "cafPdmPointer.h"
+
 class RimWellPathCollection;
 class RimProject;
 class RivWellPathPartMgr;
diff --git a/ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp b/ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
index c76a5f0df3..edc4c74fcf 100644
--- a/ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
@@ -30,6 +30,7 @@
 #include <QFileInfo>
 
 #include <fstream>
+#include <cmath>
 
 namespace caf
 {
diff --git a/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp b/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp
index 10d6ae9aaf..db11222984 100644
--- a/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigMainGrid.cpp
@@ -296,7 +296,7 @@ void RigMainGrid::calculateFaults()
 
                 // Add as fault face only if the grid index is less than the neighbors
 
-                if (gcIdx < neighborGlobalCellIdx)
+                if (static_cast<size_t>(gcIdx) < neighborGlobalCellIdx)
                 {
                     {
                         RigFault::FaultFace ff(gcIdx, cvf::StructGridInterface::FaceType(faceIdx), neighborGlobalCellIdx);