diff --git a/mission/controller/acs/util/MathOperations.h b/mission/controller/acs/util/MathOperations.h
index dd4c3f57..023e9379 100644
--- a/mission/controller/acs/util/MathOperations.h
+++ b/mission/controller/acs/util/MathOperations.h
@@ -4,15 +4,12 @@
 #include <fsfw/src/fsfw/globalfunctions/constants.h>
 #include <fsfw/src/fsfw/globalfunctions/math/MatrixOperations.h>
 #include <fsfw/src/fsfw/globalfunctions/sign.h>
-#include <stdint.h>
-#include <string.h>
-#include <sys/time.h>
+#include <fsfw/src/fsfw/serviceinterface.h>
 
 #include <cmath>
+#include <cstring>
 #include <iostream>
 
-#include "fsfw/serviceinterface.h"
-
 template <typename T1, typename T2 = T1>
 class MathOperations {
  public:
@@ -46,7 +43,7 @@ class MathOperations {
   static void selectionSort(const T1 *matrix, T1 *result, uint8_t rowSize, uint8_t colSize) {
     int min_idx;
     T1 temp;
-    memcpy(result, matrix, rowSize * colSize * sizeof(*result));
+    std::memcpy(result, matrix, rowSize * colSize * sizeof(*result));
     // One by one move boundary of unsorted subarray
     for (int k = 0; k < rowSize; k++) {
       for (int i = 0; i < colSize - 1; i++) {