diff --git a/ApplicationCode/Commands/IntersectionBoxCommands/RicAppendIntersectionBoxFeature.h b/ApplicationCode/Commands/IntersectionBoxCommands/RicAppendIntersectionBoxFeature.h
index badebb007f..c1c35838a2 100644
--- a/ApplicationCode/Commands/IntersectionBoxCommands/RicAppendIntersectionBoxFeature.h
+++ b/ApplicationCode/Commands/IntersectionBoxCommands/RicAppendIntersectionBoxFeature.h
@@ -22,6 +22,7 @@
 #include "cafCmdExecuteCommand.h"
 #include "cafPdmPointer.h"
 
+class RimIntersectionBoxCollection;
 
 //==================================================================================================
 /// 
diff --git a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
index 2479bc3a19..e80edee728 100644
--- a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
+++ b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
@@ -902,7 +902,7 @@ RigWellResultPoint RifReaderEclipseOutput::createWellResultPoint(const RigGridBa
     }
 
     // Introduced based on discussion with Håkon Høgstøl 08.09.2016
-    if (cellK >= grid->cellCountK())
+    if (cellK >= static_cast<int>(grid->cellCountK()))
     {
         int maxCellKIndex = static_cast<int>(grid->cellCountK() - 1);
         cvf::Trace::show("Well Connection for grid " + cvf::String(grid->gridName()) + "\n - Detected invalid K value (K=" + cvf::String(cellK) + ") for well : " + cvf::String(wellName) + " K clamped to " + cvf::String(maxCellKIndex));
diff --git a/ApplicationCode/ModelVisualization/Intersections/RivHexGridIntersectionTools.h b/ApplicationCode/ModelVisualization/Intersections/RivHexGridIntersectionTools.h
index 6c1e2ca0a9..9ee1ec9388 100644
--- a/ApplicationCode/ModelVisualization/Intersections/RivHexGridIntersectionTools.h
+++ b/ApplicationCode/ModelVisualization/Intersections/RivHexGridIntersectionTools.h
@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include "cvfBase.h"
 #include "cvfObject.h"
 #include "cvfVector3.h"
 #include "cvfBoundingBox.h"
diff --git a/ApplicationCode/ReservoirDataModel/RigFormationNames.cpp b/ApplicationCode/ReservoirDataModel/RigFormationNames.cpp
index a257d6a4fa..83b97c7c40 100644
--- a/ApplicationCode/ReservoirDataModel/RigFormationNames.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigFormationNames.cpp
@@ -40,7 +40,7 @@ RigFormationNames::~RigFormationNames()
 QString RigFormationNames::formationNameFromKLayerIdx(size_t Kidx)
 {
     int idx = formationIndexFromKLayerIdx(Kidx);
-    if(idx >= m_formationNames.size()) return "";
+    if(idx >= static_cast<int>(m_formationNames.size())) return "";
     if(idx == -1) return "";
 
     return m_formationNames[idx];
diff --git a/Fwk/AppFwk/cafVizExtensions/cafHexGridIntersectionTools/cafHexGridIntersectionTools.cpp b/Fwk/AppFwk/cafVizExtensions/cafHexGridIntersectionTools/cafHexGridIntersectionTools.cpp
index 289aa96862..f6ec78936c 100644
--- a/Fwk/AppFwk/cafVizExtensions/cafHexGridIntersectionTools/cafHexGridIntersectionTools.cpp
+++ b/Fwk/AppFwk/cafVizExtensions/cafHexGridIntersectionTools/cafHexGridIntersectionTools.cpp
@@ -2,6 +2,7 @@
 #include "cafHexGridIntersectionTools.h"
 
 #include "cvfPlane.h"
+#include <math.h>