diff --git a/hal/windows/UartPortFinder.cpp b/hal/windows/UartPortFinder.cpp
index b24c7a88a..b9058cd80 100644
--- a/hal/windows/UartPortFinder.cpp
+++ b/hal/windows/UartPortFinder.cpp
@@ -1,10 +1,13 @@
+// clang-format off
 #include "hal/windows/UartPortFinder.hpp"
 #include "infra/util/Optional.hpp"
+#include <initguid.h>
 #include <devpkey.h>
 #include <devpropdef.h>
-#include <initguid.h>
 #include <sstream>
 
+// clang-format on
+
 namespace hal
 {
     namespace
diff --git a/services/network_instantiations/NetworkAdapter.cpp b/services/network_instantiations/NetworkAdapter.cpp
index 15ce174f0..d437ace64 100644
--- a/services/network_instantiations/NetworkAdapter.cpp
+++ b/services/network_instantiations/NetworkAdapter.cpp
@@ -22,6 +22,11 @@ namespace main_
         return nameResolver;
     }
 
+    services::EventDispatcherWithNetwork& NetworkAdapter::EventDispatcher()
+    {
+        return network;
+    }
+
     void NetworkAdapter::Run()
     {
         network.Run();
diff --git a/services/network_instantiations/NetworkAdapter.hpp b/services/network_instantiations/NetworkAdapter.hpp
index 230fc5a24..8aa15a83c 100644
--- a/services/network_instantiations/NetworkAdapter.hpp
+++ b/services/network_instantiations/NetworkAdapter.hpp
@@ -20,6 +20,7 @@ namespace main_
         services::DatagramFactory& DatagramFactory();
         services::Multicast& Multicast();
         services::NameResolver& NameResolver();
+        services::EventDispatcherWithNetwork& EventDispatcher();
 
         void Run();