diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/EstimateUtil.h b/CEP/Calibration/BBSKernel/include/BBSKernel/EstimateUtil.h
index 935982c0ea65eafa7cceff72c71266cacad8500a..3b7860f813167b9dd7744046618cdad418783bf2 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/EstimateUtil.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/EstimateUtil.h
@@ -467,7 +467,7 @@ T storeCoeff(const Location &cell, const ParmGroup &solvables, T first)
 template <typename T>
 inline bool isfinite(T x)
 {
-    return !std::isnan(x) && !std::isinf(x);
+    return !isnan(x) && !isinf(x);
 }
 
 // @}
diff --git a/CEP/DP3/AOFlagger/src/msio/image2d.cpp b/CEP/DP3/AOFlagger/src/msio/image2d.cpp
index 185bb69b89eb450bc7bc3550a8006dff5037eee4..45078dafb74a783c4495603727376fee77b84b37 100644
--- a/CEP/DP3/AOFlagger/src/msio/image2d.cpp
+++ b/CEP/DP3/AOFlagger/src/msio/image2d.cpp
@@ -182,7 +182,7 @@ num_t Image2D::GetMaximumFinite() const {
 	for(size_t y=0;y<_height;++y)
 	{
 		for(size_t x=0;x<_width;++x) {
-			if(std::isfinite(_dataPtr[y][x]) && _dataPtr[y][x] > max) {
+			if(isfinite(_dataPtr[y][x]) && _dataPtr[y][x] > max) {
 				max = _dataPtr[y][x];
 			}
 		}
@@ -195,7 +195,7 @@ num_t Image2D::GetMinimumFinite() const {
 	for(size_t y=0;y<_height;++y)
 	{
 		for(size_t x=0;x<_width;++x) {
-			if(std::isfinite(_dataPtr[y][x]) && _dataPtr[y][x] < min) {
+			if(isfinite(_dataPtr[y][x]) && _dataPtr[y][x] < min) {
 				min = _dataPtr[y][x];
 			}
 		}
diff --git a/CEP/DP3/AOFlagger/src/strategy/algorithms/highpassfilter.cpp b/CEP/DP3/AOFlagger/src/strategy/algorithms/highpassfilter.cpp
index 426561865b8b124ef6fd730e796971f454fc809f..301d8a7694535b785c914c460ed9c85fb80baad7 100644
--- a/CEP/DP3/AOFlagger/src/strategy/algorithms/highpassfilter.cpp
+++ b/CEP/DP3/AOFlagger/src/strategy/algorithms/highpassfilter.cpp
@@ -162,7 +162,7 @@ void HighPassFilter::setFlaggedValuesToZeroAndMakeWeights(const Image2DCPtr &inp
 	{
 		for(size_t x=0;x<width;++x)
 		{
-			if(inputMask->Value(x, y) || !std::isfinite(inputImage->Value(x, y)))
+			if(inputMask->Value(x, y) || !isfinite(inputImage->Value(x, y)))
 			{
 				outputImage->SetValue(x, y, 0.0);
 				weightsOutput->SetValue(x, y, 0.0);
@@ -193,8 +193,8 @@ void HighPassFilter::setFlaggedValuesToZeroAndMakeWeightsSSE(const Image2DCPtr &
 			// Assign each integer to one bool in the mask
 			// Convert false to 0xFFFFFFFF and true to 0
 			__m128 conditionMask = _mm_castsi128_ps(
-				_mm_cmpeq_epi32(_mm_set_epi32(rowPtr[3] || !std::isfinite(inputPtr[3]), rowPtr[2] || !std::isfinite(inputPtr[2]),
-																			rowPtr[1] || !std::isfinite(inputPtr[1]), rowPtr[0] || !std::isfinite(inputPtr[0])),
+				_mm_cmpeq_epi32(_mm_set_epi32(rowPtr[3] || !isfinite(inputPtr[3]), rowPtr[2] || !isfinite(inputPtr[2]),
+																			rowPtr[1] || !isfinite(inputPtr[1]), rowPtr[0] || !isfinite(inputPtr[0])),
 												zero4i));
 			
 			_mm_store_ps(weightsPtr, _mm_or_ps(