diff --git a/bsp_q7s/gpio/gpioCallbacks.cpp b/bsp_q7s/gpio/gpioCallbacks.cpp
index b85de9ab..b9af9b02 100644
--- a/bsp_q7s/gpio/gpioCallbacks.cpp
+++ b/bsp_q7s/gpio/gpioCallbacks.cpp
@@ -1,7 +1,7 @@
 #include <bsp_q7s/gpio/gpioCallbacks.h>
 #include <fsfwconfig/devices/gpioIds.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/serviceinterface/ServiceInterface.h>
 
 
@@ -25,7 +25,7 @@ void initTcsBoardDecoder(GpioIF* gpioComIF) {
      * Initial values of the spi mux gpios can all be set to an arbitrary value expect for spi mux
      * bit 1. Setting spi mux bit 1 to high will pull all decoder outputs to high voltage level.
      */
-    GpiodRegular* spiMuxBit1 = new GpiodRegular(std::string("gpiochip7"), 13,
+    GpiodRegular spiMuxBit1 = new GpiodRegular(std::string("gpiochip7"), 13,
             std::string("SPI Mux Bit 1"), gpio::OUT, 1);
     spiMuxGpios->addGpio(gpioIds::SPI_MUX_BIT_1, spiMuxBit1);
     GpiodRegular* spiMuxBit2 = new GpiodRegular(std::string("gpiochip7"), 14,
diff --git a/bsp_q7s/gpio/gpioCallbacks.h b/bsp_q7s/gpio/gpioCallbacks.h
index 7654e548..845127fb 100644
--- a/bsp_q7s/gpio/gpioCallbacks.h
+++ b/bsp_q7s/gpio/gpioCallbacks.h
@@ -1,8 +1,8 @@
 #ifndef LINUX_GPIO_GPIOCALLBACKS_H_
 #define LINUX_GPIO_GPIOCALLBACKS_H_
 
-#include <linux/gpio/gpioDefinitions.h>
-#include <linux/gpio/GpioIF.h>
+#include <fsfw_hal/common/gpio/gpioDefinitions.h>
+#include <fsfw_hal/common/gpio/GpioIF.h>
 
 
 namespace gpioCallbacks {
diff --git a/linux/boardtest/SpiTestClass.cpp b/linux/boardtest/SpiTestClass.cpp
index b9d1df55..cb5b996c 100644
--- a/linux/boardtest/SpiTestClass.cpp
+++ b/linux/boardtest/SpiTestClass.cpp
@@ -297,27 +297,27 @@ void SpiTestClass::acsInit() {
     {
         GpiodRegular gpio(rpiGpioName, mgm0Lis3ChipSelect, "MGM_0_LIS3",
                 gpio::Direction::OUT, 1);
-        gpioCookie->addGpio(gpioIds::MGM_0_LIS3_CS, &gpio);
+        gpioCookie->addGpio(gpioIds::MGM_0_LIS3_CS, gpio);
     }
     {
         GpiodRegular gpio(rpiGpioName, mgm1Rm3100ChipSelect, "MGM_1_RM3100",
                 gpio::Direction::OUT, 1);
-        gpioCookie->addGpio(gpioIds::MGM_1_RM3100_CS, &gpio);
+        gpioCookie->addGpio(gpioIds::MGM_1_RM3100_CS, gpio);
     }
     {
         GpiodRegular gpio(rpiGpioName, gyro0AdisChipSelect, "GYRO_0_ADIS",
                 gpio::Direction::OUT, 1);
-        gpioCookie->addGpio(gpioIds::GYRO_0_ADIS_CS, &gpio);
+        gpioCookie->addGpio(gpioIds::GYRO_0_ADIS_CS, gpio);
     }
     {
         GpiodRegular gpio(rpiGpioName, gyro1L3gd20ChipSelect, "GYRO_1_L3G",
                 gpio::Direction::OUT, 1);
-        gpioCookie->addGpio(gpioIds::GYRO_1_L3G_CS, &gpio);
+        gpioCookie->addGpio(gpioIds::GYRO_1_L3G_CS, gpio);
     }
     {
         GpiodRegular gpio(rpiGpioName, gyro2L3gd20ChipSelect, "GYRO_2_L3G",
                 gpio::Direction::OUT, 1);
-        gpioCookie->addGpio(gpioIds::GYRO_2_L3G_CS, &gpio);
+        gpioCookie->addGpio(gpioIds::GYRO_2_L3G_CS, gpio);
     }
     {
         GpiodRegular gpio(rpiGpioName, mgm2Lis3mdlChipSelect, "MGM_2_LIS3",