diff --git a/bsp_q7s/ObjectFactory.cpp b/bsp_q7s/ObjectFactory.cpp
index abec2e19..3e52402a 100644
--- a/bsp_q7s/ObjectFactory.cpp
+++ b/bsp_q7s/ObjectFactory.cpp
@@ -31,8 +31,10 @@
 #include <fsfw/tmtcservices/CommandingServiceBase.h>
 #include <fsfw/tmtcservices/PusServiceBase.h>
 #include <fsfw/tmtcpacket/pus/TmPacketStored.h>
-#include <fsfw/osal/common/UdpTcPollingTask.h>
+
+/* UDP server includes */
 #include <fsfw/osal/common/UdpTmTcBridge.h>
+#include <fsfw/osal/common/UdpTcPollingTask.h>
 
 #if TEST_LIBGPIOD == 1
 #include <linux/boardtest/LibgpiodTest.h>
diff --git a/bsp_rpi/ObjectFactory.cpp b/bsp_rpi/ObjectFactory.cpp
index b2e6f23d..0c75cf81 100644
--- a/bsp_rpi/ObjectFactory.cpp
+++ b/bsp_rpi/ObjectFactory.cpp
@@ -24,10 +24,12 @@
 #include <fsfw/tmtcservices/CommandingServiceBase.h>
 #include <fsfw/tmtcservices/PusServiceBase.h>
 #include <fsfw/tmtcpacket/pus/TmPacketStored.h>
-#include <fsfw/osal/common/UdpTcPollingTask.h>
-#include <fsfw/osal/common/UdpTmTcBridge.h>
 #include <fsfw/tasks/TaskFactory.h>
 
+/* UDP server includes */
+#include <fsfw/osal/common/UdpTmTcBridge.h>
+#include <fsfw/osal/common/UdpTcPollingTask.h>
+
 #include <fsfw_hal/linux/gpio/LinuxLibgpioIF.h>
 #include <fsfw_hal/common/gpio/GpioCookie.h>
 
@@ -55,7 +57,8 @@ void ObjectFactory::produce(){
     Factory::setStaticFrameworkObjectIds();
     ObjectFactory::produceGenericObjects();
 
-    new UdpTmTcBridge(objects::UDP_BRIDGE, objects::CCSDS_PACKET_DISTRIBUTOR,
+    new UdpTmTcBridge(objects::UDP_BRIDGE,
+            objects::CCSDS_PACKET_DISTRIBUTOR,
             objects::TM_STORE, objects::TC_STORE);
     new UdpTcPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE);