diff --git a/CMakeLists.txt b/CMakeLists.txt
index 02849ca4..3cc5ffd5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -139,5 +139,4 @@ target_include_directories(${LIB_FSFW_NAME} PRIVATE
 target_compile_options(${LIB_FSFW_NAME} PRIVATE 
 	${WARNING_FLAGS}
 	${COMPILER_FLAGS}
-	${ABI_FLAGS}
 )
diff --git a/osal/host/CMakeLists.txt b/osal/host/CMakeLists.txt
index aa32990b..367f721e 100644
--- a/osal/host/CMakeLists.txt
+++ b/osal/host/CMakeLists.txt
@@ -13,9 +13,11 @@ target_sources(${LIB_FSFW_NAME}
 )
 
 if(UNIX)
+	find_package(Threads REQUIRED)
+	
 	target_link_libraries(${LIB_FSFW_NAME} 
 	PRIVATE
 		rt
-		pthread
+		${CMAKE_THREAD_LIBS_INIT}
 	)
 endif()
\ No newline at end of file
diff --git a/osal/linux/CMakeLists.txt b/osal/linux/CMakeLists.txt
index c0096e42..474e548b 100644
--- a/osal/linux/CMakeLists.txt
+++ b/osal/linux/CMakeLists.txt
@@ -18,8 +18,14 @@ target_sources(${LIB_FSFW_NAME}
 		Timer.cpp
 )
 
-target_link_libraries(${LIB_FSFW_NAME} 
-	PRIVATE
-		rt
-		pthread
+find_package(Threads REQUIRED)
+
+target_link_libraries(${LIB_FSFW_NAME} PRIVATE
+	${CMAKE_THREAD_LIBS_INIT}
+	rt
 )
+
+target_link_libraries(${LIB_FSFW_NAME} INTERFACE
+	${CMAKE_THREAD_LIBS_INIT}
+)
+
diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
new file mode 100644
index 00000000..119ef243
--- /dev/null
+++ b/unittest/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(internal)
+add_subdirectory(tests)
\ No newline at end of file