diff --git a/mission/controller/acs/SensorProcessing.cpp b/mission/controller/acs/SensorProcessing.cpp
index 6dad0a86..27067dca 100644
--- a/mission/controller/acs/SensorProcessing.cpp
+++ b/mission/controller/acs/SensorProcessing.cpp
@@ -1,19 +1,5 @@
 #include "SensorProcessing.h"
 
-#include <fsfw/datapool/PoolReadGuard.h>
-#include <fsfw/globalfunctions/constants.h>
-#include <fsfw/globalfunctions/math/MatrixOperations.h>
-#include <fsfw/globalfunctions/math/QuaternionOperations.h>
-#include <fsfw/globalfunctions/math/VectorOperations.h>
-#include <fsfw/globalfunctions/timevalOperations.h>
-#include <mission/controller/acs/Igrf13Model.h>
-#include <mission/controller/acs/util/MathOperations.h>
-#include <mission/controller/controllerdefinitions/AcsCtrlDefinitions.h>
-
-#include <cmath>
-
-using namespace Math;
-
 SensorProcessing::SensorProcessing() {}
 
 SensorProcessing::~SensorProcessing() {}
diff --git a/mission/controller/acs/SensorProcessing.h b/mission/controller/acs/SensorProcessing.h
index 6dbc5d58..6a167d83 100644
--- a/mission/controller/acs/SensorProcessing.h
+++ b/mission/controller/acs/SensorProcessing.h
@@ -1,15 +1,22 @@
 #ifndef SENSORPROCESSING_H_
 #define SENSORPROCESSING_H_
 
+#include <common/config/eive/resultClassIds.h>
+#include <fsfw/datapool/PoolReadGuard.h>
+#include <fsfw/globalfunctions/constants.h>
+#include <fsfw/globalfunctions/math/MatrixOperations.h>
+#include <fsfw/globalfunctions/math/QuaternionOperations.h>
+#include <fsfw/globalfunctions/math/VectorOperations.h>
+#include <fsfw/globalfunctions/timevalOperations.h>
 #include <fsfw/returnvalues/returnvalue.h>
-#include <stdint.h>  //uint8_t
-#include <time.h>    /*purpose, timeval ?*/
+#include <mission/controller/acs/AcsParameters.h>
+#include <mission/controller/acs/Igrf13Model.h>
+#include <mission/controller/acs/SensorValues.h>
+#include <mission/controller/acs/SusConverter.h>
+#include <mission/controller/acs/util/MathOperations.h>
+#include <mission/controller/controllerdefinitions/AcsCtrlDefinitions.h>
 
-#include "../controllerdefinitions/AcsCtrlDefinitions.h"
-#include "AcsParameters.h"
-#include "SensorValues.h"
-#include "SusConverter.h"
-#include "eive/resultClassIds.h"
+#include <cmath>
 
 class SensorProcessing {
  public: