diff --git a/mission/controller/acs/util/MathOperations.h b/mission/controller/acs/util/MathOperations.h
index dd4c3f57..c240b9ed 100644
--- a/mission/controller/acs/util/MathOperations.h
+++ b/mission/controller/acs/util/MathOperations.h
@@ -1,17 +1,10 @@
 #ifndef MATH_MATHOPERATIONS_H_
 #define MATH_MATHOPERATIONS_H_
 
-#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 <cmath>
-#include <iostream>
-
-#include "fsfw/serviceinterface.h"
 
 template <typename T1, typename T2 = T1>
 class MathOperations {
@@ -46,7 +39,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++) {