diff --git a/unittest/tests/container/TestDynamicFifo.cpp b/unittest/tests/container/TestDynamicFifo.cpp
index 759fcc66b..2b572d520 100644
--- a/unittest/tests/container/TestDynamicFifo.cpp
+++ b/unittest/tests/container/TestDynamicFifo.cpp
@@ -1,6 +1,6 @@
-#include "../../../container/DynamicFIFO.h"
-#include "../../../container/FIFO.h"
-#include "../../../returnvalues/HasReturnvaluesIF.h"
+#include <fsfw/container/DynamicFIFO.h>
+#include <fsfw/container/FIFO.h>
+#include <fsfw/returnvalues/HasReturnvaluesIF.h>
 
 #include <catch2/catch_test_macros.hpp>
 #include <unittest/core/CatchDefinitions.h>
diff --git a/unittest/tests/container/TestFifo.cpp b/unittest/tests/container/TestFifo.cpp
index f7bfb1de4..fbcd40cc6 100644
--- a/unittest/tests/container/TestFifo.cpp
+++ b/unittest/tests/container/TestFifo.cpp
@@ -1,6 +1,6 @@
-#include "../../../container/DynamicFIFO.h"
-#include "../../../container/FIFO.h"
-#include "../../../returnvalues/HasReturnvaluesIF.h"
+#include <fsfw/container/DynamicFIFO.h>
+#include <fsfw/container/FIFO.h>
+#include <fsfw/returnvalues/HasReturnvaluesIF.h>
 
 #include <catch2/catch_test_macros.hpp>
 #include <unittest/core/CatchDefinitions.h>
diff --git a/unittest/tests/container/TestFixedMap.cpp b/unittest/tests/container/TestFixedMap.cpp
index f93065b6e..297171ca0 100644
--- a/unittest/tests/container/TestFixedMap.cpp
+++ b/unittest/tests/container/TestFixedMap.cpp
@@ -1,5 +1,5 @@
-#include "../../../container/FixedMap.h"
-#include "../../../returnvalues/HasReturnvaluesIF.h"
+#include <fsfw/container/FixedMap.h>
+#include <fsfw/returnvalues/HasReturnvaluesIF.h>
 
 #include <catch2/catch_test_macros.hpp>
 #include <unittest/core/CatchDefinitions.h>
diff --git a/unittest/tests/osal/TestMessageQueue.cpp b/unittest/tests/osal/TestMessageQueue.cpp
index 5360974f6..e33b72404 100644
--- a/unittest/tests/osal/TestMessageQueue.cpp
+++ b/unittest/tests/osal/TestMessageQueue.cpp
@@ -1,5 +1,5 @@
-#include "../../../ipc/MessageQueueIF.h"
-#include "../../../ipc/QueueFactory.h"
+#include <fsfw/ipc/MessageQueueIF.h>
+#include <fsfw/ipc/QueueFactory.h>
 
 #include <catch2/catch_test_macros.hpp>
 #include <unittest/core/CatchDefinitions.h>
diff --git a/unittest/tests/serialize/TestSerialBufferAdapter.cpp b/unittest/tests/serialize/TestSerialBufferAdapter.cpp
index 778f857ed..1938746d7 100644
--- a/unittest/tests/serialize/TestSerialBufferAdapter.cpp
+++ b/unittest/tests/serialize/TestSerialBufferAdapter.cpp
@@ -1,4 +1,4 @@
-#include "../../../serialize/SerialBufferAdapter.h"
+#include <fsfw/serialize/SerialBufferAdapter.h>
 
 #include <catch2/catch_test_macros.hpp>
 #include <unittest/core/CatchDefinitions.h>
diff --git a/unittest/tests/serialize/TestSerialLinkedPacket.cpp b/unittest/tests/serialize/TestSerialLinkedPacket.cpp
index 83bdf8578..b90ae9f86 100644
--- a/unittest/tests/serialize/TestSerialLinkedPacket.cpp
+++ b/unittest/tests/serialize/TestSerialLinkedPacket.cpp
@@ -1,7 +1,7 @@
 #include "TestSerialLinkedPacket.h"
 #include <unittest/core/CatchDefinitions.h>
 
-#include "../../../globalfunctions/arrayprinter.h"
+#include <fsfw/globalfunctions/arrayprinter.h>
 
 #include <catch2/catch_test_macros.hpp>
 #include <unittest/core/CatchDefinitions.h>
diff --git a/unittest/tests/serialize/TestSerialization.cpp b/unittest/tests/serialize/TestSerialization.cpp
index 2877d09ab..3de581ec9 100644
--- a/unittest/tests/serialize/TestSerialization.cpp
+++ b/unittest/tests/serialize/TestSerialization.cpp
@@ -1,4 +1,4 @@
-#include "../../../serialize/SerializeAdapter.h"
+#include <fsfw/serialize/SerializeAdapter.h>
 
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/catch_approx.hpp>