diff --git a/hal/CMakeLists.txt b/hal/CMakeLists.txt
index 018018d0e..4cb183158 100644
--- a/hal/CMakeLists.txt
+++ b/hal/CMakeLists.txt
@@ -8,14 +8,9 @@ option(FSFW_HAL_ADD_RASPBERRY_PI "Add Raspberry Pi specific code to the sources"
 option(FSFW_HAL_ADD_STM32H7 "Add the STM32H7 HAL to the sources" OFF)
 option(FSFW_HAL_WARNING_SHADOW_LOCAL_GCC "Enable -Wshadow=local warning in GCC" ON)
 
-set(LIB_FSFW_HAL_NAME fsfw_hal)
 set(LINUX_HAL_PATH_NAME linux)
 set(STM32H7_PATH_NAME stm32h7)
 
-if(NOT LIB_FSFW_NAME)
-    message(ERROR "LIB_FSFW_NAME needs to be set as a linkable target")
-endif()
-
 add_subdirectory(src)
 add_subdirectory(inc)
 
@@ -35,7 +30,6 @@ foreach(INCLUDE_PATH ${FSFW_HAL_ADDITIONAL_INC_PATHS})
 endforeach()
 
 target_include_directories(${LIB_FSFW_NAME} PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
     ${FSFW_HAL_ADD_INC_PATHS_ABS}
 )
 
diff --git a/hal/inc/fsfw/hal/stm32h7/gpio/gpio.h b/hal/inc/fsfw/hal/stm32h7/gpio/gpio.h
index adb60de65..38fcd708d 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 4b1ef801b..c2554544c 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 7a9a0e18e..bff90a5b0 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/linux/uart/CMakeLists.txt b/hal/src/linux/uart/CMakeLists.txt
index d8cea5a82..21ed0278f 100644
--- a/hal/src/linux/uart/CMakeLists.txt
+++ b/hal/src/linux/uart/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_sources(${TARGET_NAME} PUBLIC
+target_sources(${LIB_FSFW_NAME} PUBLIC
 	UartComIF.cpp
 	UartCookie.cpp
 )
diff --git a/hal/src/linux/utility.cpp b/hal/src/linux/utility.cpp
index c63b80148..04fded6c6 100644
--- a/hal/src/linux/utility.cpp
+++ b/hal/src/linux/utility.cpp
@@ -1,4 +1,9 @@
-#include <fsfw_hal/linux/utility.h>
+#include "fsfw/FSFW.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/hal/linux/utility.h"
+
+#include <cerrno>
+#include <cstring>
 
 void utility::handleIoctlError(const char* const customPrintout) {
 #if FSFW_VERBOSE_LEVEL >= 1
diff --git a/hal/src/stm32h7/devicetest/GyroL3GD20H.cpp b/hal/src/stm32h7/devicetest/GyroL3GD20H.cpp
index 8176c3c25..6765f5400 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/dma.cpp b/hal/src/stm32h7/dma.cpp
index 91fb3382a..288e42944 100644
--- a/hal/src/stm32h7/dma.cpp
+++ b/hal/src/stm32h7/dma.cpp
@@ -1,6 +1,7 @@
-#include <fsfw_hal/stm32h7/dma.h>
-#include <stdint.h>
-#include <stddef.h>
+#include <fsfw/hal/stm32h7/dma.h>
+
+#include <cstdint>
+#include <cstddef>
 
 user_handler_t DMA_1_USER_HANDLERS[8];
 user_args_t DMA_1_USER_ARGS[8];
diff --git a/hal/src/stm32h7/gpio/gpio.cpp b/hal/src/stm32h7/gpio/gpio.cpp
index 50873f753..927588a37 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 732fb5ea7..d1484de06 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 06c0ac5ff..82d705c21 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 80d2ffe04..424a8bfb9 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 feec65f07..a72bf12b6 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 fbceb9345..6a83ae42b 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 83ba73229..90cfe7065 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 826ecb23a..f1f2815ef 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"