diff --git a/src/fsfw/globalfunctions/math/MatrixOperations.h b/src/fsfw/globalfunctions/math/MatrixOperations.h
index 89c99862..8d08ed90 100644
--- a/src/fsfw/globalfunctions/math/MatrixOperations.h
+++ b/src/fsfw/globalfunctions/math/MatrixOperations.h
@@ -1,9 +1,11 @@
 #ifndef MATRIXOPERATIONS_H_
 #define MATRIXOPERATIONS_H_
 
+#include <fsfw/retval.h>
 #include <stdint.h>
 
 #include <cmath>
+#include <cstring>
 #include <utility>
 
 template <typename T1, typename T2 = T1, typename T3 = T2>
@@ -100,7 +102,7 @@ class MatrixOperations {
   static bool isFinite(const T1 *inputMatrix, uint8_t rows, uint8_t cols) {
     for (uint8_t col = 0; col < cols; col++) {
       for (uint8_t row = 0; row < rows; row++) {
-        if (not isfinite(inputMatrix[row * cols + cols])) {
+        if (not std::isfinite(inputMatrix[row * cols + cols])) {
           return false;
         }
       }
diff --git a/src/fsfw/globalfunctions/math/VectorOperations.h b/src/fsfw/globalfunctions/math/VectorOperations.h
index 6ea21db0..ca82c7f3 100644
--- a/src/fsfw/globalfunctions/math/VectorOperations.h
+++ b/src/fsfw/globalfunctions/math/VectorOperations.h
@@ -101,7 +101,7 @@ class VectorOperations {
 
   static bool isFinite(const T *inputVector, uint8_t size) {
     for (uint8_t i = 0; i < size; i++) {
-      if (not isfinite(inputVector[i])) {
+      if (not std::isfinite(inputVector[i])) {
         return false;
       }
     }