diff --git a/CMakeLists.txt b/CMakeLists.txt
index 90e1bd7..72dc17b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,11 +20,6 @@ if(NOT LIB_FSFW_NAME)
     message(ERROR "LIB_FSFW_NAME needs to be set as a linkable target")
 endif()
 
-target_include_directories(${LIB_FSFW_HAL_NAME} PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-
 add_subdirectory(common)
 
 if(FSFW_HAL_ADD_LINUX)
@@ -39,6 +34,10 @@ target_link_libraries(${LIB_FSFW_HAL_NAME} PRIVATE
     ${LIB_FSFW_NAME}
 )
 
+target_include_directories(${LIB_FSFW_HAL_NAME} PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     if(NOT DEFINED FSFW_WARNING_FLAGS)
 	   set(FSFW_WARNING_FLAGS
diff --git a/linux/gpio/LinuxLibgpioIF.h b/linux/gpio/LinuxLibgpioIF.h
index be24692..7238056 100644
--- a/linux/gpio/LinuxLibgpioIF.h
+++ b/linux/gpio/LinuxLibgpioIF.h
@@ -1,7 +1,7 @@
 #ifndef LINUX_GPIO_LINUXLIBGPIOIF_H_
 #define LINUX_GPIO_LINUXLIBGPIOIF_H_
 
-#include <common/gpio/GpioIF.h>
+#include "../../common/gpio/GpioIF.h"
 #include <returnvalues/classIds.h>
 #include <fsfw/objectmanager/SystemObject.h>
 
diff --git a/linux/spi/SpiComIF.cpp b/linux/spi/SpiComIF.cpp
index a2bc865..e0a55a5 100644
--- a/linux/spi/SpiComIF.cpp
+++ b/linux/spi/SpiComIF.cpp
@@ -16,6 +16,14 @@
 #include <cerrno>
 #include <cstring>
 
+#ifndef SPI_SEND_WIRETAPPING
+#define SPI_SEND_WIRETAPPING    0
+#endif
+
+#ifndef SPI_RECV_WIRETAPPING
+#define SPI_RECV_WIRETAPPING    0
+#endif
+
 SpiComIF::SpiComIF(object_id_t objectId, GpioIF* gpioComIF): SystemObject(objectId),
         gpioComIF(gpioComIF) {
     if(gpioComIF == nullptr) {