diff --git a/mission/genericFactory.cpp b/mission/genericFactory.cpp
index 2dd00ee6..bd22dc6b 100644
--- a/mission/genericFactory.cpp
+++ b/mission/genericFactory.cpp
@@ -39,6 +39,7 @@
 #include <mission/tmtc/PusTmFunnel.h>
 #include <mission/tmtc/PusTmRouteByFilterHelper.h>
 #include <mission/tmtc/TmFunnelHandler.h>
+#include "mission/tmtc/Service15TmStorage.h"
 
 #include "OBSWConfig.h"
 #include "devices/gpioIds.h"
@@ -52,13 +53,13 @@
 #include "mission/tmtc/tmFilters.h"
 #include "objects/systemObjectList.h"
 #include "tmtc/pusIds.h"
+#include "devices/gpioIds.h"
 
 using persTmStore::PersistentTmStores;
 
 #if OBSW_ADD_TCPIP_SERVERS == 1
 #if OBSW_ADD_TMTC_UDP_SERVER == 1
 // UDP server includes
-#include "devices/gpioIds.h"
 #include "fsfw/osal/common/UdpTcPollingTask.h"
 #include "fsfw/osal/common/UdpTmTcBridge.h"
 #endif
@@ -66,7 +67,6 @@ using persTmStore::PersistentTmStores;
 // TCP server includes
 #include "fsfw/osal/common/TcpTmTcBridge.h"
 #include "fsfw/osal/common/TcpTmTcServer.h"
-#include "mission/tmtc/Service15TmStorage.h"
 #endif
 #endif