diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index 14f8524f..93d24504 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -43,7 +43,9 @@
 #include "linux/boardtest/SpiTestClass.h"
 #include "linux/csp/CspComIF.h"
 #include "linux/csp/CspCookie.h"
-#include "linux/devices/GPSHyperionLinuxController.h"
+#include "mission/devices/SolarArrayDeploymentHandler.h"
+#include "mission/devices/SusHandler.h"
+#include "mission/devices/devicedefinitions/SusDefinitions.h"
 #include "mission/core/GenericFactory.h"
 #include "mission/devices/ACUHandler.h"
 #include "mission/devices/BpxBatteryHandler.h"
diff --git a/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp b/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
index 95803042..e35a77b3 100644
--- a/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
+++ b/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
@@ -1,14 +1,12 @@
 #include "pollingSequenceFactory.h"
+#include "OBSWConfig.h"
+#include "objects/systemObjectList.h"
 
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
 #include <fsfw/objectmanager/ObjectManagerIF.h>
 #include <fsfw/serviceinterface/ServiceInterfaceStream.h>
 #include <fsfw/tasks/FixedTimeslotTaskIF.h>
 
-#include "OBSWConfig.h"
-#include "mission/devices/SusHandler.h"
-#include "objects/systemObjectList.h"
-
 ReturnValue_t pst::pstGpio(FixedTimeslotTaskIF *thisSequence) {
   // Length of a communication cycle
   uint32_t length = thisSequence->getPeriodMs();
diff --git a/mission/devices/SusHandler.cpp b/mission/devices/SusHandler.cpp
index 8324f450..9c55409e 100644
--- a/mission/devices/SusHandler.cpp
+++ b/mission/devices/SusHandler.cpp
@@ -5,8 +5,7 @@
 
 #include "OBSWConfig.h"
 
-SusHandler::SusHandler(object_id_t objectId, uint8_t susIdx, object_id_t comIF, CookieIF *comCookie,
-                       LinuxLibgpioIF *gpioComIF, gpioId_t chipSelectId)
+SusHandler::SusHandler(object_id_t objectId, uint8_t susIdx, object_id_t comIF, CookieIF *comCookie)
     : DeviceHandlerBase(objectId, comIF, comCookie), divider(5), dataset(this), susIdx(susIdx) {}
 
 SusHandler::~SusHandler() {}
diff --git a/mission/devices/SusHandler.h b/mission/devices/SusHandler.h
index 5b8c056f..18587c71 100644
--- a/mission/devices/SusHandler.h
+++ b/mission/devices/SusHandler.h
@@ -2,7 +2,6 @@
 #define MISSION_DEVICES_SUSHANDLER_H_
 
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
-#include <fsfw_hal/linux/gpio/LinuxLibgpioIF.h>
 
 #include "devicedefinitions/SusDefinitions.h"
 #include "fsfw/globalfunctions/PeriodicOperationDivider.h"
@@ -28,8 +27,7 @@ class SusHandler : public DeviceHandlerBase {
 
   static const uint8_t FIRST_WRITE = 7;
 
-  SusHandler(object_id_t objectId, uint8_t susIdx, object_id_t comIF, CookieIF* comCookie,
-             LinuxLibgpioIF* gpioComIF, gpioId_t chipSelectId);
+  SusHandler(object_id_t objectId, uint8_t susIdx, object_id_t comIF, CookieIF* comCookie);
   virtual ~SusHandler();
 
   void enablePeriodicPrintout(bool enable, uint8_t divider);