diff --git a/stm32h7/networking/UdpTcLwIpPollingTask.cpp b/stm32h7/networking/UdpTcLwIpPollingTask.cpp
index 4972976..68820eb 100644
--- a/stm32h7/networking/UdpTcLwIpPollingTask.cpp
+++ b/stm32h7/networking/UdpTcLwIpPollingTask.cpp
@@ -5,10 +5,11 @@
 #include "app_dhcp.h"
 #include <hardware_init.h>
 
-#include <fsfw/ipc/MutexGuard.h>
-#include <fsfw/serviceinterface/ServiceInterface.h>
+#include "fsfw/ipc/MutexGuard.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/objectmanager/ObjectManager.h"
 
-#include <lwip/timeouts.h>
+#include "lwip/timeouts.h"
 
 UdpTcLwIpPollingTask::UdpTcLwIpPollingTask(object_id_t objectId, object_id_t bridgeId):
         SystemObject(objectId), periodicHandleCounter(0), bridgeId(bridgeId) {
@@ -18,7 +19,7 @@ UdpTcLwIpPollingTask::~UdpTcLwIpPollingTask() {
 }
 
 ReturnValue_t UdpTcLwIpPollingTask::initialize() {
-    udpBridge = objectManager->get<TmTcLwIpUdpBridge>(bridgeId);
+    udpBridge = ObjectManager::instance()->get<TmTcLwIpUdpBridge>(bridgeId);
     if(udpBridge == nullptr) {
         return ObjectManagerIF::CHILD_INIT_FAILED;
     }
diff --git a/stm32h7/networking/app_dhcp.c b/stm32h7/networking/app_dhcp.c
index 6209c86..7c990ad 100644
--- a/stm32h7/networking/app_dhcp.c
+++ b/stm32h7/networking/app_dhcp.c
@@ -1,11 +1,12 @@
 #include "app_dhcp.h"
 #include "app_ethernet.h"
-#include <common/stm32_nucleo/networking/udp_config.h>
-#include <common/stm32_nucleo/networking/ethernetif.h>
-#include <OBSWConfig.h>
+#include "OBSWConfig.h"
 
-#include <lwip/dhcp.h>
-#include <stm32h7xx_nucleo.h>
+#include "example_common/stm32h7/networking/udp_config.h"
+#include "example_common/stm32h7/networking/ethernetif.h"
+
+#include "lwip/dhcp.h"
+#include "stm32h7xx_nucleo.h"
 
 #include <stdbool.h>
 
diff --git a/stm32h7/networking/app_dhcp.h b/stm32h7/networking/app_dhcp.h
index 8f58b81..d077275 100644
--- a/stm32h7/networking/app_dhcp.h
+++ b/stm32h7/networking/app_dhcp.h
@@ -5,11 +5,11 @@
 extern "C" {
 #endif
 
-#include <lwipopts.h>
+#include "lwipopts.h"
 
 #if LWIP_DHCP == 1
 
-#include <lwip/netif.h>
+#include "lwip/netif.h"
 
 /* DHCP process states */
 #define DHCP_OFF                   (uint8_t) 0