diff --git a/hal/inc/fsfw/hal/stm32h7/gpio/gpio.h b/hal/inc/fsfw/hal/stm32h7/gpio/gpio.h
index adb60de6..38fcd708 100644
--- a/hal/inc/fsfw/hal/stm32h7/gpio/gpio.h
+++ b/hal/inc/fsfw/hal/stm32h7/gpio/gpio.h
@@ -9,6 +9,4 @@ void initializeGpioClock(GPIO_TypeDef* gpioPort);
 
 }
 
-
-
 #endif /* FSFW_HAL_STM32H7_GPIO_GPIO_H_ */
diff --git a/hal/inc/fsfw/hal/stm32h7/spi/SpiComIF.h b/hal/inc/fsfw/hal/stm32h7/spi/SpiComIF.h
index 4b1ef801..c2554544 100644
--- a/hal/inc/fsfw/hal/stm32h7/spi/SpiComIF.h
+++ b/hal/inc/fsfw/hal/stm32h7/spi/SpiComIF.h
@@ -5,8 +5,8 @@
 #include "fsfw/devicehandlers/DeviceCommunicationIF.h"
 #include "fsfw/objectmanager/SystemObject.h"
 
-#include "fsfw/osal/FreeRTOS/BinarySemaphore.h"
-#include "fsfw_hal/stm32h7/spi/spiDefinitions.h"
+#include "fsfw/osal/freertos/BinarySemaphore.h"
+#include "fsfw/hal/stm32h7/spi/spiDefinitions.h"
 #include "stm32h7xx_hal_spi.h"
 #include "stm32h743xx.h"
 
diff --git a/hal/inc/fsfw/hal/stm32h7/spi/spiCore.h b/hal/inc/fsfw/hal/stm32h7/spi/spiCore.h
index 7a9a0e18..bff90a5b 100644
--- a/hal/inc/fsfw/hal/stm32h7/spi/spiCore.h
+++ b/hal/inc/fsfw/hal/stm32h7/spi/spiCore.h
@@ -1,11 +1,12 @@
 #ifndef FSFW_HAL_STM32H7_SPI_SPICORE_H_
 #define FSFW_HAL_STM32H7_SPI_SPICORE_H_
 
-#include <fsfw_hal/stm32h7/dma.h>
+#include "fsfw/hal/stm32h7/dma.h"
+#include "fsfw/hal/stm32h7/spi/spiDefinitions.h"
+
 #include "stm32h7xx_hal.h"
 #include "stm32h7xx_hal_dma.h"
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/hal/src/stm32h7/devicetest/GyroL3GD20H.cpp b/hal/src/stm32h7/devicetest/GyroL3GD20H.cpp
index 8176c3c2..6765f540 100644
--- a/hal/src/stm32h7/devicetest/GyroL3GD20H.cpp
+++ b/hal/src/stm32h7/devicetest/GyroL3GD20H.cpp
@@ -1,10 +1,10 @@
-#include "GyroL3GD20H.h"
+#include "fsfw/hal/stm32h7/devicetest/GyroL3GD20H.h"
 
-#include "../spi/mspInit.h"
-#include "../spi/spiDefinitions.h"
-#include "../spi/spiCore.h"
-#include "../spi/spiInterrupts.h"
-#include "../spi/stm32h743ziSpi.h"
+#include "fsfw/hal/stm32h7/spi/mspInit.h"
+#include "fsfw/hal/stm32h7/spi/spiDefinitions.h"
+#include "fsfw/hal/stm32h7/spi/spiCore.h"
+#include "fsfw/hal/stm32h7/spi/spiInterrupts.h"
+#include "fsfw/hal/stm32h7/spi/stm32h743ziSpi.h"
 
 #include "fsfw/tasks/TaskFactory.h"
 #include "fsfw/serviceinterface/ServiceInterface.h"
diff --git a/hal/src/stm32h7/gpio/gpio.cpp b/hal/src/stm32h7/gpio/gpio.cpp
index 50873f75..927588a3 100644
--- a/hal/src/stm32h7/gpio/gpio.cpp
+++ b/hal/src/stm32h7/gpio/gpio.cpp
@@ -1,4 +1,4 @@
-#include "gpio.h"
+#include "fsfw/hal/stm32h7/gpio/gpio.h"
 
 #include "stm32h7xx_hal_rcc.h"
 
diff --git a/hal/src/stm32h7/spi/SpiComIF.cpp b/hal/src/stm32h7/spi/SpiComIF.cpp
index 732fb5ea..d1484de0 100644
--- a/hal/src/stm32h7/spi/SpiComIF.cpp
+++ b/hal/src/stm32h7/spi/SpiComIF.cpp
@@ -1,12 +1,12 @@
-#include "SpiComIF.h"
-#include "SpiCookie.h"
+#include "fsfw/hal/stm32h7/spi/SpiComIF.h"
+#include "fsfw/hal/stm32h7/spi/SpiCookie.h"
 
 #include "fsfw/tasks/SemaphoreFactory.h"
-#include "fsfw/osal/FreeRTOS/TaskManagement.h"
-#include "fsfw_hal/stm32h7/spi/spiCore.h"
-#include "fsfw_hal/stm32h7/spi/spiInterrupts.h"
-#include "fsfw_hal/stm32h7/spi/mspInit.h"
-#include "fsfw_hal/stm32h7/gpio/gpio.h"
+#include "fsfw/osal/freertos/TaskManagement.h"
+#include "fsfw/hal/stm32h7/spi/spiCore.h"
+#include "fsfw/hal/stm32h7/spi/spiInterrupts.h"
+#include "fsfw/hal/stm32h7/spi/mspInit.h"
+#include "fsfw/hal/stm32h7/gpio/gpio.h"
 
 #include "stm32h7xx_hal_gpio.h"
 
diff --git a/hal/src/stm32h7/spi/SpiCookie.cpp b/hal/src/stm32h7/spi/SpiCookie.cpp
index 06c0ac5f..82d705c2 100644
--- a/hal/src/stm32h7/spi/SpiCookie.cpp
+++ b/hal/src/stm32h7/spi/SpiCookie.cpp
@@ -1,4 +1,4 @@
-#include "SpiCookie.h"
+#include "fsfw/hal/stm32h7/spi/SpiCookie.h"
 
 
 SpiCookie::SpiCookie(address_t deviceAddress, spi::SpiBus spiIdx, spi::TransferModes transferMode,
diff --git a/hal/src/stm32h7/spi/mspInit.cpp b/hal/src/stm32h7/spi/mspInit.cpp
index 80d2ffe0..424a8bfb 100644
--- a/hal/src/stm32h7/spi/mspInit.cpp
+++ b/hal/src/stm32h7/spi/mspInit.cpp
@@ -1,13 +1,14 @@
-#include <fsfw_hal/stm32h7/dma.h>
-#include "mspInit.h"
-#include "spiCore.h"
-#include "spiInterrupts.h"
+#include "fsfw/hal/stm32h7/dma.h"
+#include "fsfw/hal/stm32h7/spi/mspInit.h"
+#include "fsfw/hal/stm32h7/spi/spiCore.h"
+#include "fsfw/hal/stm32h7/spi/spiInterrupts.h"
+
 #include "stm32h743xx.h"
 #include "stm32h7xx_hal_spi.h"
 #include "stm32h7xx_hal_dma.h"
 #include "stm32h7xx_hal_def.h"
 
-#include <stdio.h>
+#include <cstdio>
 
 spi::msp_func_t mspInitFunc = nullptr;
 spi::MspCfgBase* mspInitArgs = nullptr;
diff --git a/hal/src/stm32h7/spi/spiCore.cpp b/hal/src/stm32h7/spi/spiCore.cpp
index feec65f0..a72bf12b 100644
--- a/hal/src/stm32h7/spi/spiCore.cpp
+++ b/hal/src/stm32h7/spi/spiCore.cpp
@@ -1,5 +1,6 @@
-#include "spiDefinitions.h"
-#include "spiCore.h"
+#include "fsfw/hal/stm32h7/spi/spiCore.h"
+#include "fsfw/hal/stm32h7/spi/spiDefinitions.h"
+
 #include <cstdio>
 
 SPI_HandleTypeDef* spiHandle = nullptr;
diff --git a/hal/src/stm32h7/spi/spiDefinitions.cpp b/hal/src/stm32h7/spi/spiDefinitions.cpp
index fbceb934..6a83ae42 100644
--- a/hal/src/stm32h7/spi/spiDefinitions.cpp
+++ b/hal/src/stm32h7/spi/spiDefinitions.cpp
@@ -1,4 +1,4 @@
-#include "spiDefinitions.h"
+#include "fsfw/hal/stm32h7/spi/spiDefinitions.h"
 
 void spi::assignSpiMode(SpiModes spiMode, SPI_HandleTypeDef& spiHandle) {
     switch(spiMode) {
diff --git a/hal/src/stm32h7/spi/spiInterrupts.cpp b/hal/src/stm32h7/spi/spiInterrupts.cpp
index 83ba7322..90cfe706 100644
--- a/hal/src/stm32h7/spi/spiInterrupts.cpp
+++ b/hal/src/stm32h7/spi/spiInterrupts.cpp
@@ -1,5 +1,5 @@
-#include "spiInterrupts.h"
-#include "spiCore.h"
+#include "fsfw/hal/stm32h7/spi/spiInterrupts.h"
+#include "fsfw/hal/stm32h7/spi/spiCore.h"
 
 #include "stm32h7xx_hal.h"
 #include "stm32h7xx_hal_dma.h"
diff --git a/hal/src/stm32h7/spi/stm32h743ziSpi.cpp b/hal/src/stm32h7/spi/stm32h743ziSpi.cpp
index 826ecb23..f1f2815e 100644
--- a/hal/src/stm32h7/spi/stm32h743ziSpi.cpp
+++ b/hal/src/stm32h7/spi/stm32h743ziSpi.cpp
@@ -1,6 +1,7 @@
-#include "stm32h743ziSpi.h"
-#include "spiCore.h"
-#include "spiInterrupts.h"
+#include "fsfw/hal/stm32h7/spi/stm32h743ziSpi.h"
+#include "fsfw/hal/stm32h7/spi/spiCore.h"
+#include "fsfw/hal/stm32h7/spi/spiInterrupts.h"
+
 #include "stm32h7xx_hal.h"
 #include "stm32h7xx_hal_rcc.h"