From c979b84f5d8989ab9fcc9bd7d2102e15366aa6a9 Mon Sep 17 00:00:00 2001
From: MFransen <m.fransen@metrological.com>
Date: Thu, 4 Jun 2026 16:21:40 +0200
Subject: [PATCH 1/2] [Messaging] Fix windows build

---
 interfaces/Interfaces.vcxproj         | 2 +-
 interfaces/Interfaces.vcxproj.filters | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/interfaces/Interfaces.vcxproj b/interfaces/Interfaces.vcxproj
index 154e4f2e..bc6c8379 100644
--- a/interfaces/Interfaces.vcxproj
+++ b/interfaces/Interfaces.vcxproj
@@ -56,7 +56,7 @@
     <ClCompile Include="proxystubs\ProxyStubs_Math.cpp" />
     <ClCompile Include="proxystubs\ProxyStubs_MediaPlayer.cpp" />
     <ClCompile Include="proxystubs\ProxyStubs_Memory.cpp" />
-    <ClCompile Include="proxystubs\ProxyStubs_MessageControl.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_MessagingControl.cpp" />
     <ClCompile Include="proxystubs\ProxyStubs_Messenger.cpp" />
     <ClCompile Include="proxystubs\ProxyStubs_Netflix.cpp" />
     <ClCompile Include="proxystubs\ProxyStubs_NetflixSecurity.cpp" />
diff --git a/interfaces/Interfaces.vcxproj.filters b/interfaces/Interfaces.vcxproj.filters
index ec0a8905..52329f46 100644
--- a/interfaces/Interfaces.vcxproj.filters
+++ b/interfaces/Interfaces.vcxproj.filters
@@ -35,7 +35,7 @@
     <ClCompile Include="proxystubs\ProxyStubs_Math.cpp" />
     <ClCompile Include="proxystubs\ProxyStubs_MediaPlayer.cpp" />
     <ClCompile Include="proxystubs\ProxyStubs_Memory.cpp" />
-    <ClCompile Include="proxystubs\ProxyStubs_MessageControl.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_MessagingControl.cpp" />
     <ClCompile Include="proxystubs\ProxyStubs_Messenger.cpp" />
     <ClCompile Include="proxystubs\ProxyStubs_Netflix.cpp" />
     <ClCompile Include="proxystubs\ProxyStubs_NetflixSecurity.cpp" />

From 8d53d194f036bf02d9d84c5b14043191206247bc Mon Sep 17 00:00:00 2001
From: MFransen <m.fransen@metrological.com>
Date: Thu, 4 Jun 2026 16:26:11 +0200
Subject: [PATCH 2/2] [Messaging] Fix windows build

---
 definitions/Definitions.vcxproj.filters | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/definitions/Definitions.vcxproj.filters b/definitions/Definitions.vcxproj.filters
index b7cf283f..e14cd640 100644
--- a/definitions/Definitions.vcxproj.filters
+++ b/definitions/Definitions.vcxproj.filters
@@ -58,7 +58,7 @@
     <ClCompile Include="..\interfaces\json\JsonEnum_MemoryMonitor.cpp">
       <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\interfaces\json\JsonEnum_MessageControl.cpp">
+    <ClCompile Include="..\interfaces\json\JsonEnum_MessagingControl.cpp">
       <Filter>Generated Files</Filter>
     </ClCompile>
     <ClCompile Include="..\interfaces\json\JsonEnum_Messenger.cpp">
@@ -176,7 +176,7 @@
     <CustomBuild Include="..\interfaces\IMemoryMonitor.h">
       <Filter>Interface Files</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\interfaces\IMessageControl.h">
+    <CustomBuild Include="..\interfaces\IMessagingControl.h">
       <Filter>Interface Files</Filter>
     </CustomBuild>
     <CustomBuild Include="..\interfaces\IMessenger.h">