diff --git a/unittest/internal/osal/IntTestMq.cpp b/unittest/internal/osal/IntTestMq.cpp
index 9917285f..fc8e963e 100644
--- a/unittest/internal/osal/IntTestMq.cpp
+++ b/unittest/internal/osal/IntTestMq.cpp
@@ -1,8 +1,8 @@
 #include "IntTestMq.h"
-#include "../UnittDefinitions.h"
+#include <fsfw/unittest/internal/UnittDefinitions.h>
 
-#include "../../../ipc/MessageQueueIF.h"
-#include "../../../ipc/QueueFactory.h"
+#include <fsfw/ipc/MessageQueueIF.h>
+#include <fsfw/ipc/QueueFactory.h>
 
 #include <array>
 
diff --git a/unittest/internal/osal/IntTestMutex.cpp b/unittest/internal/osal/IntTestMutex.cpp
index d2f8b962..3316de74 100644
--- a/unittest/internal/osal/IntTestMutex.cpp
+++ b/unittest/internal/osal/IntTestMutex.cpp
@@ -1,10 +1,10 @@
 #include "IntTestMutex.h"
 
-#include "../../../ipc/MutexFactory.h"
-#include "../UnittDefinitions.h"
+#include <fsfw/ipc/MutexFactory.h>
+#include <fsfw/unittest/internal/UnittDefinitions.h>
 
 #if defined(hosted)
-#include "../../osal/hosted/Mutex.h"
+#include <fsfw/osal/hosted/Mutex.h>
 #include <thread>
 #include <future>
 #endif
diff --git a/unittest/internal/osal/IntTestSemaphore.cpp b/unittest/internal/osal/IntTestSemaphore.cpp
index 6d2719d5..5a82f78c 100644
--- a/unittest/internal/osal/IntTestSemaphore.cpp
+++ b/unittest/internal/osal/IntTestSemaphore.cpp
@@ -1,10 +1,11 @@
 #include "IntTestSemaphore.h"
-#include "../UnittDefinitions.h"
+#include <fsfw/unittest/internal/UnittDefinitions.h>
 
-#include "../../../tasks/SemaphoreFactory.h"
-#include "../../../serviceinterface/ServiceInterfaceStream.h"
-#include "../../../timemanager/Stopwatch.h"
+#include <fsfw/tasks/SemaphoreFactory.h>
+#include <fsfw/serviceinterface/ServiceInterfaceStream.h>
+#include <fsfw/timemanager/Stopwatch.h>
 
+#include <cstdlib>
 
 void testsemaph::testBinSemaph() {
 	std::string id = "[BinSemaphore]";
@@ -138,7 +139,7 @@ void testsemaph::testCountingSemaphImplementation(SemaphoreIF* countingSemaph,
 		// attempt to take when count is 0, measure time
 		result = countingSemaph->acquire(SemaphoreIF::TimeoutType::WAITING, 10);
 		dur_millis_t time = stopwatch.stop();
-		if(abs(time - 10) > 1) {
+		if(std::abs(static_cast<int32_t>(time - 10)) > 1) {
 			unitt::put_error(id);
 		}
 	}
diff --git a/unittest/internal/serialize/IntTestSerialization.cpp b/unittest/internal/serialize/IntTestSerialization.cpp
index 793661c5..69d82942 100644
--- a/unittest/internal/serialize/IntTestSerialization.cpp
+++ b/unittest/internal/serialize/IntTestSerialization.cpp
@@ -1,9 +1,9 @@
 #include "IntTestSerialization.h"
-#include "../UnittDefinitions.h"
+#include <fsfw/unittest/internal/UnittDefinitions.h>
 
-#include "../../../serialize/SerializeElement.h"
-#include "../../../serialize/SerialBufferAdapter.h"
-#include "../../../serialize/SerializeIF.h"
+#include <fsfw/serialize/SerializeElement.h>
+#include <fsfw/serialize/SerialBufferAdapter.h>
+#include <fsfw/serialize/SerializeIF.h>
 
 #include <array>