From f60ceb411a2c838908039b0ef024aba05f083b46 Mon Sep 17 00:00:00 2001
From: Pierre Wielders <pierre@wielders.net>
Date: Wed, 3 Jan 2024 16:34:34 +0100
Subject: [PATCH] [WINDOWS] Include all generated files currently being build.
 (#315)

---
 definitions/Definitions.vcxproj         |  51 ++++
 definitions/Definitions.vcxproj.filters | 160 ++++++++++++-
 interfaces/Interfaces.vcxproj           | 149 ++++++++----
 interfaces/Interfaces.vcxproj.filters   | 302 +++++++++++++++++-------
 4 files changed, 530 insertions(+), 132 deletions(-)

diff --git a/definitions/Definitions.vcxproj b/definitions/Definitions.vcxproj
index 230deff2..fead4e6d 100644
--- a/definitions/Definitions.vcxproj
+++ b/definitions/Definitions.vcxproj
@@ -19,8 +19,59 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\interfaces\json\JsonEnum_BluetoothControl.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_BluetoothRemoteControl.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_Browser.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_BrowserCookieJar.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_BrowserResources.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_BrowserScripting.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_BrowserSecurity.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_Butler.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_Cobalt.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_Compositor.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_Containers.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_DeviceIdentification.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_DeviceInfo.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_DHCPServer.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_DIALServer.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_Dictionary.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_DisplayInfo.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_DTV.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_FirmwareControl.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_InputSwitch.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_IOConnector.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_IOControl.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_LocationSync.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_Math.cpp" />
     <ClCompile Include="..\interfaces\json\JsonEnum_MessageControl.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_Messenger.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_Monitor.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_Netflix.cpp" />
     <ClCompile Include="..\interfaces\json\JsonEnum_NetworkControl.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_OCDM.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_Packager.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_PerformanceMonitor.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_PlayerInfo.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_Power.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_Provisioning.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_RemoteControl.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_ScriptEngine.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_SecureShellServer.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_SecurityAgent.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_Spark.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_StateControl.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_Streamer.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_SubsystemControl.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_SystemCommands.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_TestController.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_TestUtility.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_TimeSync.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_TimeZone.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_TraceControl.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_ValuePoint.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_WatchDog.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_WebBrowser.cpp" />
+    <ClCompile Include="..\interfaces\json\JsonEnum_ZigWave.cpp" />
     <ClCompile Include="Definitions.cpp" />
   </ItemGroup>
   <ItemGroup>
diff --git a/definitions/Definitions.vcxproj.filters b/definitions/Definitions.vcxproj.filters
index d8423717..7d70d6ea 100644
--- a/definitions/Definitions.vcxproj.filters
+++ b/definitions/Definitions.vcxproj.filters
@@ -13,16 +13,172 @@
     <Filter Include="Interfaces">
       <UniqueIdentifier>{832f72b9-f988-4a91-98b6-0a6e62b7ca87}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Generated Files">
+      <UniqueIdentifier>{cd531e85-d48e-4490-989c-8353fa16792e}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Definitions.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\interfaces\json\JsonEnum_MessageControl.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Generated Files</Filter>
     </ClCompile>
     <ClCompile Include="..\interfaces\json\JsonEnum_NetworkControl.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_BluetoothControl.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_BluetoothRemoteControl.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_Browser.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_BrowserCookieJar.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_BrowserResources.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_BrowserScripting.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_BrowserSecurity.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_Butler.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_Cobalt.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_Compositor.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_Containers.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_DeviceIdentification.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_DeviceInfo.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_DHCPServer.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_DIALServer.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_Dictionary.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_DisplayInfo.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_DTV.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_FirmwareControl.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_InputSwitch.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_IOConnector.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_IOControl.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_LocationSync.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_Math.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_Messenger.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_Monitor.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_Netflix.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_OCDM.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_Packager.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_PerformanceMonitor.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_PlayerInfo.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_Power.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_Provisioning.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_RemoteControl.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_ScriptEngine.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_SecureShellServer.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_SecurityAgent.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_Spark.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_StateControl.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_Streamer.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_SubsystemControl.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_SystemCommands.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_TestController.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_TestUtility.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_TimeSync.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_TimeZone.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_TraceControl.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_ValuePoint.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_WatchDog.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_WebBrowser.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\interfaces\json\JsonEnum_ZigWave.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
diff --git a/interfaces/Interfaces.vcxproj b/interfaces/Interfaces.vcxproj
index 17b47709..000c345a 100644
--- a/interfaces/Interfaces.vcxproj
+++ b/interfaces/Interfaces.vcxproj
@@ -23,50 +23,88 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Module.cpp" />
-    <ClCompile Include="ProxyStubs_AVNClient.cpp" />
-    <ClCompile Include="ProxyStubs_AVSClient.cpp" />
-    <ClCompile Include="ProxyStubs_Browser.cpp" />
-    <ClCompile Include="ProxyStubs_Butler.cpp" />
-    <ClCompile Include="ProxyStubs_Composition.cpp" />
-    <ClCompile Include="ProxyStubs_Configuration.cpp" />
-    <ClCompile Include="ProxyStubs_ContentDecryption.cpp" />
-    <ClCompile Include="ProxyStubs_DeviceInfo.cpp" />
-    <ClCompile Include="ProxyStubs_DIALServer.cpp" />
-    <ClCompile Include="ProxyStubs_Dictionary.cpp" />
-    <ClCompile Include="ProxyStubs_DisplayInfo.cpp" />
-    <ClCompile Include="ProxyStubs_Dolby.cpp" />
-    <ClCompile Include="ProxyStubs_DsgccClient.cpp" />
-    <ClCompile Include="ProxyStubs_External.cpp" />
-    <ClCompile Include="ProxyStubs_Guide.cpp" />
-    <ClCompile Include="ProxyStubs_InputPin.cpp" />
-    <ClCompile Include="ProxyStubs_InputSwitch.cpp" />
-    <ClCompile Include="ProxyStubs_KeyHandler.cpp" />
-    <ClCompile Include="ProxyStubs_Math.cpp" />
-    <ClCompile Include="ProxyStubs_Netflix.cpp" />
-    <ClCompile Include="ProxyStubs_Packager.cpp" />
-    <ClCompile Include="ProxyStubs_Performance.cpp" />
-    <ClCompile Include="ProxyStubs_PlayerInfo.cpp" />
-    <ClCompile Include="ProxyStubs_PlayGiga.cpp" />
-    <ClCompile Include="ProxyStubs_Power.cpp" />
-    <ClCompile Include="ProxyStubs_Provisioning.cpp" />
-    <ClCompile Include="ProxyStubs_RemoteControl.cpp" />
-    <ClCompile Include="ProxyStubs_ResourceMonitor.cpp" />
-    <ClCompile Include="ProxyStubs_RPCLink.cpp" />
-    <ClCompile Include="ProxyStubs_RtspClient.cpp" />
-    <ClCompile Include="ProxyStubs_Stream.cpp" />
-    <ClCompile Include="ProxyStubs_TestController.cpp" />
-    <ClCompile Include="ProxyStubs_TestUtility.cpp" />
-    <ClCompile Include="ProxyStubs_TimeZone.cpp" />
-    <ClCompile Include="ProxyStubs_VoiceHandler.cpp" />
-    <ClCompile Include="ProxyStubs_VolumeControl.cpp" />
-    <ClCompile Include="ProxyStubs_WebDriver.cpp" />
-    <ClCompile Include="ProxyStubs_WebPA.cpp" />
-    <ClCompile Include="ProxyStubs_WebServer.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubsMetadata.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_AmazonPrime.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_Application.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_AVNClient.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_AVSClient.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_Bluetooth.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_BluetoothAudio.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_Browser.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_Butler.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_Capture.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_Composition.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_Configuration.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_ContentDecryption.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_Cryptography.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_CustomerCareOperations.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_DeviceInfo.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_DIALServer.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_Dictionary.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_DisplayInfo.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_DNSServer.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_Dolby.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_DsgccClient.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_External.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_Focus.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_Guide.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_InputPin.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_InputSwitch.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_IPNetwork.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_KeyHandler.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_LanguageTag.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_LISA.cpp" />
+    <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_Messenger.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_Netflix.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_NetflixSecurity.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_NetworkControl.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_NetworkTools.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_OCDM.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_PackageManager.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_Packager.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_Performance.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_PlayerInfo.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_PlayGiga.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_Power.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_Provisioning.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_RemoteControl.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_ResourceMonitor.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_RPCLink.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_RtspClient.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_RustBridge.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_ScriptEngine.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_SecureShellServer.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_Store.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_StoreCache.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_Stream.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_SwitchBoard.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_SystemCommands.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_TestController.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_TestUtility.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_TextToSpeech.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_TimeSync.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_TimeZone.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_ValuePoint.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_VoiceHandler.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_VolumeControl.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_WatchDog.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_WebDriver.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_WebPA.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_WebServer.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_WifiControl.cpp" />
+    <ClCompile Include="proxystubs\ProxyStubs_ZigWave.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="IAmazonPrime.h" />
+    <ClInclude Include="IApplication.h" />
     <ClInclude Include="IAVNClient.h" />
     <ClInclude Include="IAVSClient.h" />
     <ClInclude Include="IBluetooth.h" />
+    <ClInclude Include="IBluetoothAudio.h" />
     <ClInclude Include="IBrowser.h" />
     <ClInclude Include="IButler.h" />
     <ClInclude Include="ICapture.h" />
@@ -80,20 +118,25 @@
     <ClInclude Include="IDictionary.h" />
     <ClInclude Include="IDisplayInfo.h" />
     <ClInclude Include="IDNSServer.h" />
+    <ClInclude Include="IDolby.h" />
     <ClInclude Include="IDRM.h" />
     <ClInclude Include="Ids.h" />
     <ClInclude Include="IDsgccClient.h" />
     <ClInclude Include="IExternal.h" />
     <ClInclude Include="IExternalBase.h" />
+    <ClInclude Include="IFocus.h" />
     <ClInclude Include="IGuide.h" />
     <ClInclude Include="IInputSwitch.h" />
     <ClInclude Include="IIPNetwork.h" />
     <ClInclude Include="IKeyHandler.h" />
+    <ClInclude Include="ILanguageTag.h" />
     <ClInclude Include="IMemory.h" />
     <ClInclude Include="IMessageControl.h" />
     <ClInclude Include="INetflix.h" />
     <ClInclude Include="INetflixSecurity.h" />
+    <ClInclude Include="INetworkTools.h" />
     <ClInclude Include="IOCDM.h" />
+    <ClInclude Include="IPackageManager.h" />
     <ClInclude Include="IPackager.h" />
     <ClInclude Include="IPerformance.h" />
     <ClInclude Include="IPlayGiga.h" />
@@ -103,16 +146,20 @@
     <ClInclude Include="IRtspClient.h" />
     <ClInclude Include="IRustBridge.h" />
     <ClInclude Include="IScriptEngine.h" />
+    <ClInclude Include="IStore.h" />
+    <ClInclude Include="IStoreCache.h" />
     <ClInclude Include="IStream.h" />
     <ClInclude Include="ISwitchBoard.h" />
     <ClInclude Include="ISystemCommands.h" />
     <ClInclude Include="ITestController.h" />
+    <ClInclude Include="ITextToSpeech.h" />
     <ClInclude Include="ITimeSync.h" />
     <ClInclude Include="ITimeZone.h" />
     <ClInclude Include="IValuePoint.h" />
     <ClInclude Include="IVoiceHandler.h" />
     <ClInclude Include="IWebDriver.h" />
     <ClInclude Include="IWebServer.h" />
+    <ClInclude Include="IWifiControl.h" />
     <ClInclude Include="Module.h" />
     <ClInclude Include="ValuePoint.h" />
   </ItemGroup>
@@ -208,9 +255,9 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>PROXYSTUB_BUILDING;_CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>INTERFACES_EXPORTS;_CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;$(ProjectDir);$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -222,7 +269,7 @@
       <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
     </Link>
     <PreBuildEvent>
-      <Command>python "$(ToolPath)\ProxyStubGenerator\StubGenerator.py" -I $(FrameworkPath) -I $(ProjectDir) "$(ProjectDir)."</Command>
+      <Command>python "$(ToolPath)\ProxyStubGenerator\StubGenerator.py" --outdir "$(ProjectDir)proxystubs" -I $(FrameworkPath) -I $(ProjectDir) "$(ProjectDir)I*.h"</Command>
     </PreBuildEvent>
     <PreBuildEvent>
       <Message>Create ProxyStub code</Message>
@@ -242,9 +289,9 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>PROXYSTUB_BUILDING;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>INTERFACES_EXPORTS;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;$(ProjectDir);$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -254,7 +301,7 @@
       <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
     </Link>
     <PreBuildEvent>
-      <Command>python "$(ToolPath)\ProxyStubGenerator\StubGenerator.py" -I $(FrameworkPath) -I $(ProjectDir) "$(ProjectDir)."</Command>
+      <Command>python "$(ToolPath)\ProxyStubGenerator\StubGenerator.py" --outdir "$(ProjectDir)proxystubs" -I $(FrameworkPath) -I $(ProjectDir) "$(ProjectDir)I*.h"</Command>
     </PreBuildEvent>
     <PreBuildEvent>
       <Message>Create ProxyStub code</Message>
@@ -274,9 +321,9 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>PROXYSTUB_BUILDING;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>INTERFACES_EXPORTS;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;$(ProjectDir);$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -286,7 +333,7 @@
       <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
     </Link>
     <PreBuildEvent>
-      <Command>python "$(ToolPath)\ProxyStubGenerator\StubGenerator.py" -I $(FrameworkPath) -I $(ProjectDir) "$(ProjectDir)."</Command>
+      <Command>python "$(ToolPath)\ProxyStubGenerator\StubGenerator.py" --outdir "$(ProjectDir)proxystubs" -I $(FrameworkPath) -I $(ProjectDir) "$(ProjectDir)I*.h"</Command>
     </PreBuildEvent>
     <PreBuildEvent>
       <Message>Create ProxyStub code</Message>
@@ -308,9 +355,9 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>PROXYSTUB_BUILDING;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>INTERFACES_EXPORTS;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;$(ProjectDir);$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -322,7 +369,7 @@
       <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
     </Link>
     <PreBuildEvent>
-      <Command>python "$(ToolPath)\ProxyStubGenerator\StubGenerator.py" -I $(FrameworkPath) -I $(ProjectDir) "$(ProjectDir)."</Command>
+      <Command>python "$(ToolPath)\ProxyStubGenerator\StubGenerator.py" --outdir "$(ProjectDir)proxystubs" -I $(FrameworkPath) -I $(ProjectDir) "$(ProjectDir)I*.h"</Command>
     </PreBuildEvent>
     <PreBuildEvent>
       <Message>Create ProxyStub code</Message>
diff --git a/interfaces/Interfaces.vcxproj.filters b/interfaces/Interfaces.vcxproj.filters
index 66cc5d27..2e0eec64 100644
--- a/interfaces/Interfaces.vcxproj.filters
+++ b/interfaces/Interfaces.vcxproj.filters
@@ -1,125 +1,230 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="ProxyStubs_AVNClient.cpp">
+    <ClCompile Include="Module.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_Browser.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_AmazonPrime.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_Composition.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_Application.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_ContentDecryption.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_AVNClient.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_DsgccClient.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_AVSClient.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_Guide.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_Bluetooth.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_Netflix.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_BluetoothAudio.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_Packager.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_Browser.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_Performance.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_Butler.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_PlayGiga.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_Capture.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_Power.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_Composition.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_Provisioning.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_Configuration.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_RPCLink.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_ContentDecryption.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_RtspClient.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_Cryptography.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_Stream.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_CustomerCareOperations.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_TestController.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_DeviceInfo.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_TestUtility.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_DIALServer.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_WebDriver.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_Dictionary.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_WebPA.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_DisplayInfo.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_WebServer.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_DNSServer.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_AVSClient.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_Dolby.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_Dictionary.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_DsgccClient.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_DisplayInfo.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_External.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_Dolby.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_Focus.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_External.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_Guide.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_InputPin.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_InputPin.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_InputSwitch.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_InputSwitch.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_KeyHandler.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_IPNetwork.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_Math.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_KeyHandler.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_PlayerInfo.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_LanguageTag.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_RemoteControl.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_LISA.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_ResourceMonitor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_Math.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_VoiceHandler.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_MediaPlayer.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_VolumeControl.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_Memory.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="Module.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_MessageControl.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_Configuration.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_Messenger.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_DIALServer.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_Netflix.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_DeviceInfo.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_NetflixSecurity.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_TimeZone.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_NetworkControl.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProxyStubs_Butler.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="proxystubs\ProxyStubs_NetworkTools.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_OCDM.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_PackageManager.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_Packager.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_Performance.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_PlayerInfo.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_PlayGiga.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_Power.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_Provisioning.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_RemoteControl.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_ResourceMonitor.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_RPCLink.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_RtspClient.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_RustBridge.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_ScriptEngine.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_SecureShellServer.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_Store.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_StoreCache.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_Stream.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_SwitchBoard.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_SystemCommands.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_TestController.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_TestUtility.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_TextToSpeech.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_TimeSync.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_TimeZone.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_ValuePoint.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_VoiceHandler.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_VolumeControl.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_WatchDog.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_WebDriver.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_WebPA.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_WebServer.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_WifiControl.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubs_ZigWave.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proxystubs\ProxyStubsMetadata.cpp">
+      <Filter>Generated Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -132,6 +237,9 @@
     <Filter Include="Interface Files">
       <UniqueIdentifier>{379b5f39-b7a5-466c-bd91-4f42b78a78bb}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Generated Files">
+      <UniqueIdentifier>{94509df5-c439-4303-be5b-8d14fd112d48}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Module.h">
@@ -287,6 +395,42 @@
     <ClInclude Include="IDNSServer.h">
       <Filter>Interface Files</Filter>
     </ClInclude>
+    <ClInclude Include="IApplication.h">
+      <Filter>Interface Files</Filter>
+    </ClInclude>
+    <ClInclude Include="IDolby.h">
+      <Filter>Interface Files</Filter>
+    </ClInclude>
+    <ClInclude Include="IAmazonPrime.h">
+      <Filter>Interface Files</Filter>
+    </ClInclude>
+    <ClInclude Include="IBluetoothAudio.h">
+      <Filter>Interface Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ILanguageTag.h">
+      <Filter>Interface Files</Filter>
+    </ClInclude>
+    <ClInclude Include="IPackageManager.h">
+      <Filter>Interface Files</Filter>
+    </ClInclude>
+    <ClInclude Include="IFocus.h">
+      <Filter>Interface Files</Filter>
+    </ClInclude>
+    <ClInclude Include="INetworkTools.h">
+      <Filter>Interface Files</Filter>
+    </ClInclude>
+    <ClInclude Include="IStore.h">
+      <Filter>Interface Files</Filter>
+    </ClInclude>
+    <ClInclude Include="IWifiControl.h">
+      <Filter>Interface Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ITextToSpeech.h">
+      <Filter>Interface Files</Filter>
+    </ClInclude>
+    <ClInclude Include="IStoreCache.h">
+      <Filter>Interface Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Text Include="CMakeLists.txt" />