diff --git a/src/Interaction/contactSearch/methods/mapperNBS.H b/src/Interaction/contactSearch/methods/mapperNBS.H
index 4677bbde..ae908ed7 100644
--- a/src/Interaction/contactSearch/methods/mapperNBS.H
+++ b/src/Interaction/contactSearch/methods/mapperNBS.H
@@ -25,6 +25,7 @@ Licence:
 #include "cells.H"
 #include "contactSearchFunctions.H"
 #include "baseAlgorithms.H"
+#include "ViewAlgorithms.H"
 
 namespace pFlow
 {
diff --git a/src/phasicFlow/Kokkos/KokkosUtilities.H b/src/phasicFlow/Kokkos/KokkosUtilities.H
index 05d11a9e..98dc4f02 100644
--- a/src/phasicFlow/Kokkos/KokkosUtilities.H
+++ b/src/phasicFlow/Kokkos/KokkosUtilities.H
@@ -23,6 +23,8 @@ Licence:
 
 
 #include "KokkosTypes.H"
+#include "pFlowMacros.H"
+#include "types.H"
 
 
 namespace pFlow
diff --git a/src/phasicFlow/Kokkos/baseAlgorithms.H b/src/phasicFlow/Kokkos/baseAlgorithms.H
index 2446509c..11c8df45 100644
--- a/src/phasicFlow/Kokkos/baseAlgorithms.H
+++ b/src/phasicFlow/Kokkos/baseAlgorithms.H
@@ -23,6 +23,7 @@ Licence:
 
 
 #include "numericConstants.H"
+#include "KokkosUtilities.H"
 
 inline const size_t sizeToSerial__ = 64;
 
diff --git a/src/phasicFlow/ranges/combinedRange.H b/src/phasicFlow/ranges/combinedRange.H
index c5891dd9..a5dc1ab0 100644
--- a/src/phasicFlow/ranges/combinedRange.H
+++ b/src/phasicFlow/ranges/combinedRange.H
@@ -21,11 +21,12 @@ Licence:
 #ifndef __combinedRange_H__
 #define __combinedRange_H__
 
+#include <vector>
 
 #include "stridedRange.H"
 #include "intervalRange.H"
 #include "Lists.H"
-#include "Vectors.H"
+
 #include "Set.H"
 
 namespace pFlow
@@ -52,7 +53,7 @@ public:
 	
 	combinedRange(){}
 
-	combinedRange(const wordVector& strRanges)
+	combinedRange(const std::vector<word>& strRanges)
 	{
 		if(!addRanges(strRanges))
 		{
@@ -60,7 +61,7 @@ public:
 		}
 	}
 
-	bool addRanges(const wordVector& strRanges)
+	bool addRanges(const std::vector<word>& strRanges)
 	{
 		for(auto& sR: strRanges)
 		{
diff --git a/utilities/checkPhasicFlow/checkPhasicFlow.C b/utilities/checkPhasicFlow/checkPhasicFlow.C
index 83e1b031..00c962e6 100755
--- a/utilities/checkPhasicFlow/checkPhasicFlow.C
+++ b/utilities/checkPhasicFlow/checkPhasicFlow.C
@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-
+#include "KokkosTypes.H"
 #include "systemControl.H"
 #include "commandLine.H"
 
diff --git a/utilities/postprocessPhasicFlow/postprocessPhasicFlow.C b/utilities/postprocessPhasicFlow/postprocessPhasicFlow.C
index 1f76a425..6750981b 100644
--- a/utilities/postprocessPhasicFlow/postprocessPhasicFlow.C
+++ b/utilities/postprocessPhasicFlow/postprocessPhasicFlow.C
@@ -18,6 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
+#include "KokkosUtilities.H"
 #include "systemControl.H"
 #include "timeFolder.H"
 #include "commandLine.H"