diff --git a/mission/controller/acs/AcsParameters.cpp b/mission/controller/acs/AcsParameters.cpp
index 8559d868..42408868 100644
--- a/mission/controller/acs/AcsParameters.cpp
+++ b/mission/controller/acs/AcsParameters.cpp
@@ -2,7 +2,7 @@
 #include "AcsParameters.h"
 
 #include <stddef.h>
-#include <math.h>
+#include <cmath>
 
 AcsParameters::AcsParameters() {
 
diff --git a/mission/controller/acs/Guidance.h b/mission/controller/acs/Guidance.h
index 76cfce77..736d8b9b 100644
--- a/mission/controller/acs/Guidance.h
+++ b/mission/controller/acs/Guidance.h
@@ -12,7 +12,7 @@
 #include <AcsParameters.h>
 #include <SensorValues.h>
 #include <OutputValues.h>
-#include <sys/time.h>
+#include <time.h>
 
 
 class Guidance {
diff --git a/mission/controller/acs/Igrf13Model.h b/mission/controller/acs/Igrf13Model.h
index b6f14e0f..3ea2cb40 100644
--- a/mission/controller/acs/Igrf13Model.h
+++ b/mission/controller/acs/Igrf13Model.h
@@ -17,10 +17,10 @@
 #define IGRF13MODEL_H_
 
 #include <fsfw/parameters/HasParametersIF.h>
-//#include <cmath>
+#include <cmath>
 #include <stdint.h>
 #include <string.h>
-#include <sys/time.h>
+#include <time.h>
 
 
 // Output should be transformed to [T] instead of [nT]
diff --git a/mission/controller/acs/SensorProcessing.h b/mission/controller/acs/SensorProcessing.h
index 43c93722..23abcc40 100644
--- a/mission/controller/acs/SensorProcessing.h
+++ b/mission/controller/acs/SensorProcessing.h
@@ -6,7 +6,7 @@
 #define SENSORPROCESSING_H_
 
 #include <stdint.h> //uint8_t
-#include <sys/time.h> /*purpose, timeval ?*/
+#include <time.h> /*purpose, timeval ?*/
 #include <config/classIds.h>
 #include <fsfw/src/fsfw/returnvalues/returnvalue.h>
 #include <AcsParameters.h>
diff --git a/mission/controller/acs/SensorValues.cpp b/mission/controller/acs/SensorValues.cpp
index 25f2d61f..414c93ef 100644
--- a/mission/controller/acs/SensorValues.cpp
+++ b/mission/controller/acs/SensorValues.cpp
@@ -4,7 +4,7 @@
  *  Created on: 30 Mar 2022
  *      Author: rooob
  */
-#include <acs/SensorValues.h>
+#include <SensorValues.h>
 
 #include <stddef.h>
 #include <cmath>
diff --git a/mission/controller/acs/SensorValues.h b/mission/controller/acs/SensorValues.h
index 566eec81..001b141b 100644
--- a/mission/controller/acs/SensorValues.h
+++ b/mission/controller/acs/SensorValues.h
@@ -95,5 +95,5 @@ public:
 };
 } /* namespace ACS */
 
-#endif ENSORVALUES_H_
+#endif /*ENSORVALUES_H_*/
 
diff --git a/mission/controller/acs/control/Detumble.h b/mission/controller/acs/control/Detumble.h
index 47efd49d..618be6c6 100644
--- a/mission/controller/acs/control/Detumble.h
+++ b/mission/controller/acs/control/Detumble.h
@@ -15,7 +15,7 @@
 #include <acs/AcsParameters.h>
 #include <acs/config/classIds.h>
 #include <fsfw/returnvalues/returnvalue.h>
-#include <sys/time.h>
+#include <time.h>
 
 class Detumble{