diff --git a/bsp_q7s/ObjectFactory.cpp b/bsp_q7s/ObjectFactory.cpp
index f81fc173..70e2db20 100644
--- a/bsp_q7s/ObjectFactory.cpp
+++ b/bsp_q7s/ObjectFactory.cpp
@@ -24,8 +24,8 @@
 #include <linux/csp/CspComIF.h>
 #include <linux/i2c/I2cCookie.h>
 #include <linux/i2c/I2cComIF.h>
-#include <linux/gpio/LinuxLibgpioIF.h>
-#include <linux/gpio/GpioCookie.h>
+#include <fsfw_hal/linux/gpio/LinuxLibgpioIF.h>
+#include <fsfw_hal/common/gpio/GpioCookie.h>
 
 #include <fsfw/datapoollocal/LocalDataPoolManager.h>
 #include <fsfw/tmtcservices/CommandingServiceBase.h>
diff --git a/bsp_q7s/devices/HeaterHandler.cpp b/bsp_q7s/devices/HeaterHandler.cpp
index 9a44c57b..21a4a3f4 100644
--- a/bsp_q7s/devices/HeaterHandler.cpp
+++ b/bsp_q7s/devices/HeaterHandler.cpp
@@ -2,7 +2,7 @@
 #include <fsfwconfig/devices/powerSwitcherList.h>
 #include <fsfw/ipc/QueueFactory.h>
 #include <devices/gpioIds.h>
-#include <linux/gpio/GpioCookie.h>
+#include <fsfw_hal/common/gpio/GpioCookie.h>
 
 HeaterHandler::HeaterHandler(object_id_t setObjectId_, object_id_t gpioDriverId_,
         CookieIF * gpioCookie_, object_id_t mainLineSwitcherObjectId_, uint8_t mainLineSwitch_) :
diff --git a/bsp_q7s/devices/HeaterHandler.h b/bsp_q7s/devices/HeaterHandler.h
index 01319ce9..8969ebd9 100644
--- a/bsp_q7s/devices/HeaterHandler.h
+++ b/bsp_q7s/devices/HeaterHandler.h
@@ -10,7 +10,7 @@
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
 #include <fsfw/devicehandlers/CookieIF.h>
 #include <fsfw/timemanager/Countdown.h>
-#include <linux/gpio/GpioIF.h>
+#include <fsfw_hal/common/gpio/GpioIF.h>
 #include <unordered_map>
 
 /**
diff --git a/bsp_q7s/devices/SolarArrayDeploymentHandler.cpp b/bsp_q7s/devices/SolarArrayDeploymentHandler.cpp
index d307ef15..25be3927 100644
--- a/bsp_q7s/devices/SolarArrayDeploymentHandler.cpp
+++ b/bsp_q7s/devices/SolarArrayDeploymentHandler.cpp
@@ -3,7 +3,7 @@
 #include <devices/powerSwitcherList.h>
 #include <devices/gpioIds.h>
 
-#include <linux/gpio/GpioCookie.h>
+#include <fsfw_hal/common/gpio/GpioCookie.h>
 #include <fsfw/ipc/QueueFactory.h>
 
 
diff --git a/bsp_q7s/devices/SolarArrayDeploymentHandler.h b/bsp_q7s/devices/SolarArrayDeploymentHandler.h
index b7e94f23..5e573128 100644
--- a/bsp_q7s/devices/SolarArrayDeploymentHandler.h
+++ b/bsp_q7s/devices/SolarArrayDeploymentHandler.h
@@ -1,8 +1,6 @@
 #ifndef MISSION_DEVICES_SOLARARRAYDEPLOYMENT_H_
 #define MISSION_DEVICES_SOLARARRAYDEPLOYMENT_H_
 
-#include <linux/gpio/GpioIF.h>
-
 #include <fsfw/objectmanager/SystemObject.h>
 #include <fsfw/tasks/ExecutableObjectIF.h>
 #include <fsfw/returnvalues/HasReturnvaluesIF.h>
@@ -11,7 +9,7 @@
 #include <fsfw/devicehandlers/CookieIF.h>
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
 #include <fsfw/timemanager/Countdown.h>
-
+#include <fsfw_hal/common/gpio/GpioIF.h>
 #include <unordered_map>
 
 /**
diff --git a/fsfw_hal b/fsfw_hal
index f094e992..20b4b5d5 160000
--- a/fsfw_hal
+++ b/fsfw_hal
@@ -1 +1 @@
-Subproject commit f094e9921db807344ed5488f662295034eb89731
+Subproject commit 20b4b5d5d3c5f1af807634e75f859ded2dc74012