diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5660443f..0497a42f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -119,3 +119,7 @@ target_include_directories(${LIB_FSFW_NAME} PRIVATE
 	${CMAKE_SOURCE_DIR}
 	${FSFW_CONFIG_PATH_ABSOLUTE}
 )
+
+target_compile_options(${LIB_FSFW_NAME} PRIVATE 
+	${ABI_FLAGS}
+)
diff --git a/osal/FreeRTOS/CMakeLists.txt b/osal/FreeRTOS/CMakeLists.txt
index c310c5cf..95462010 100644
--- a/osal/FreeRTOS/CMakeLists.txt
+++ b/osal/FreeRTOS/CMakeLists.txt
@@ -14,6 +14,7 @@ target_sources(${LIB_FSFW_NAME}
 		SemaphoreFactory.cpp
 		TaskFactory.cpp
 		Timekeeper.cpp
+		TaskManagement.cpp
 )
 
 # FreeRTOS is required to link the FSFW now. It is recommended to compile