diff --git a/bsp_q7s/ObjectFactory.cpp b/bsp_q7s/ObjectFactory.cpp
index fc9a199f..4b4c12d9 100644
--- a/bsp_q7s/ObjectFactory.cpp
+++ b/bsp_q7s/ObjectFactory.cpp
@@ -40,15 +40,12 @@
 #include <fsfw/datapoollocal/LocalDataPoolManager.h>
 #include <fsfw/tmtcservices/CommandingServiceBase.h>
 #include <fsfw/tmtcservices/PusServiceBase.h>
-#include <fsfw/osal/linux/TmTcUnixUdpBridge.h>
 #include <fsfw/tmtcpacket/pus/TmPacketStored.h>
-#include <fsfw/osal/linux/TmTcUnixUdpBridge.h>
 #include <fsfw/osal/common/UdpTcPollingTask.h>
 
 #include <fsfw/datapoollocal/LocalDataPoolManager.h>
 #include <fsfw/tmtcservices/CommandingServiceBase.h>
 #include <fsfw/tmtcservices/PusServiceBase.h>
-#include <fsfw/osal/linux/TmTcUnixUdpBridge.h>
 #include <fsfw/tmtcpacket/pus/TmPacketStored.h>
 
 #if TEST_LIBGPIOD == 1
diff --git a/fsfw b/fsfw
index 52b549b9..ff33a127 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 52b549b97c36350a0c43b9fb3563802e670440da
+Subproject commit ff33a1274daf1af83832501036f2adbb807ba690